home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-10-28 | 69.9 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 72 6d 73 40 70 73 69 |piled by| rms@psi|
|00000020| 6c 6f 63 69 6e 2e 67 6e | 75 2e 61 69 2e 6d 69 74 |locin.gn|u.ai.mit|
|00000030| 2e 65 64 75 20 6f 6e 20 | 54 75 65 20 4a 75 6c 20 |.edu on |Tue Jul |
|00000040| 33 30 20 31 37 3a 35 35 | 3a 32 37 20 31 39 39 36 |30 17:55|:27 1996|
|00000050| 0a 3b 3b 3b 20 66 72 6f | 6d 20 66 69 6c 65 20 2f |.;;; fro|m file /|
|00000060| 68 6f 6d 65 2f 66 73 66 | 2f 72 6d 73 2f 65 31 39 |home/fsf|/rms/e19|
|00000070| 2f 6c 69 73 70 2f 65 6d | 65 72 67 65 2e 65 6c 0a |/lisp/em|erge.el.|
|00000080| 3b 3b 3b 20 65 6d 61 63 | 73 20 76 65 72 73 69 6f |;;; emac|s versio|
|00000090| 6e 20 31 39 2e 33 31 2e | 39 37 2e 33 2e 0a 3b 3b |n 19.31.|97.3..;;|
|000000a0| 3b 20 62 79 74 65 63 6f | 6d 70 20 76 65 72 73 69 |; byteco|mp versi|
|000000b0| 6f 6e 20 46 53 46 20 32 | 2e 31 30 0a 3b 3b 3b 20 |on FSF 2|.10.;;; |
|000000c0| 6f 70 74 69 6d 69 7a 61 | 74 69 6f 6e 20 69 73 20 |optimiza|tion is |
|000000d0| 6f 6e 2e 0a 3b 3b 3b 20 | 74 68 69 73 20 66 69 6c |on..;;; |this fil|
|000000e0| 65 20 75 73 65 73 20 6f | 70 63 6f 64 65 73 20 77 |e uses o|pcodes w|
|000000f0| 68 69 63 68 20 64 6f 20 | 6e 6f 74 20 65 78 69 73 |hich do |not exis|
|00000100| 74 20 69 6e 20 45 6d 61 | 63 73 20 31 38 2e 0a 0a |t in Ema|cs 18...|
|00000110| 28 69 66 20 28 61 6e 64 | 20 28 62 6f 75 6e 64 70 |(if (and| (boundp|
|00000120| 20 27 65 6d 61 63 73 2d | 76 65 72 73 69 6f 6e 29 | 'emacs-|version)|
|00000130| 0a 09 20 28 6f 72 20 28 | 61 6e 64 20 28 62 6f 75 |.. (or (|and (bou|
|00000140| 6e 64 70 20 27 65 70 6f | 63 68 3a 3a 76 65 72 73 |ndp 'epo|ch::vers|
|00000150| 69 6f 6e 29 20 65 70 6f | 63 68 3a 3a 76 65 72 73 |ion) epo|ch::vers|
|00000160| 69 6f 6e 29 0a 09 20 20 | 20 20 20 28 73 74 72 69 |ion).. | (stri|
|00000170| 6e 67 2d 6c 65 73 73 70 | 20 65 6d 61 63 73 2d 76 |ng-lessp| emacs-v|
|00000180| 65 72 73 69 6f 6e 20 22 | 31 39 2e 32 39 22 29 29 |ersion "|19.29"))|
|00000190| 29 0a 20 20 20 20 28 65 | 72 72 6f 72 20 22 60 65 |). (e|rror "`e|
|000001a0| 6d 65 72 67 65 2e 65 6c | 27 20 77 61 73 20 63 6f |merge.el|' was co|
|000001b0| 6d 70 69 6c 65 64 20 66 | 6f 72 20 45 6d 61 63 73 |mpiled f|or Emacs|
|000001c0| 20 31 39 2e 32 39 20 6f | 72 20 6c 61 74 65 72 22 | 19.29 o|r later"|
|000001d0| 29 29 0a 0a 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |))...(by|te-code |
|000001e0| 22 c0 c1 21 84 5c 6e 00 | c2 c3 21 11 c1 5c 66 42 |"..!.\n.|..!..\fB|
|000001f0| 14 c1 89 4a 4d 88 c5 09 | c6 c7 23 88 c5 09 c8 c9 |...JM...|..#.....|
|00000200| 23 88 c5 09 ca cb 23 88 | c5 09 cc cd 23 88 c5 09 |#.....#.|....#...|
|00000210| ce cf 23 88 c5 09 d0 d1 | 23 88 c5 09 d2 d3 23 87 |..#.....|#.....#.|
|00000220| 22 20 5b 62 6f 75 6e 64 | 70 20 6d 65 6e 75 2d 62 |" [bound|p menu-b|
|00000230| 61 72 2d 65 6d 65 72 67 | 65 2d 6d 65 6e 75 20 6d |ar-emerg|e-menu m|
|00000240| 61 6b 65 2d 73 70 61 72 | 73 65 2d 6b 65 79 6d 61 |ake-spar|se-keyma|
|00000250| 70 20 22 45 6d 65 72 67 | 65 22 20 63 75 72 72 65 |p "Emerg|e" curre|
|00000260| 6e 74 2d 6c 6f 61 64 2d | 6c 69 73 74 20 64 65 66 |nt-load-|list def|
|00000270| 69 6e 65 2d 6b 65 79 20 | 5b 65 6d 65 72 67 65 2d |ine-key |[emerge-|
|00000280| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 69 65 |merge-di|rectorie|
|00000290| 73 5d 20 28 22 4d 65 72 | 67 65 20 44 69 72 65 63 |s] ("Mer|ge Direc|
|000002a0| 74 6f 72 69 65 73 2e 2e | 2e 22 20 2e 20 65 6d 65 |tories..|." . eme|
|000002b0| 72 67 65 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |rge-merg|e-direct|
|000002c0| 6f 72 69 65 73 29 20 5b | 65 6d 65 72 67 65 2d 72 |ories) [|emerge-r|
|000002d0| 65 76 69 73 69 6f 6e 73 | 2d 77 69 74 68 2d 61 6e |evisions|-with-an|
|000002e0| 63 65 73 74 6f 72 5d 20 | 28 22 52 65 76 69 73 69 |cestor] |("Revisi|
|000002f0| 6f 6e 73 20 77 69 74 68 | 20 41 6e 63 65 73 74 6f |ons with| Ancesto|
|00000300| 72 2e 2e 2e 22 20 2e 20 | 65 6d 65 72 67 65 2d 72 |r..." . |emerge-r|
|00000310| 65 76 69 73 69 6f 6e 73 | 2d 77 69 74 68 2d 61 6e |evisions|-with-an|
|00000320| 63 65 73 74 6f 72 29 20 | 5b 65 6d 65 72 67 65 2d |cestor) |[emerge-|
|00000330| 72 65 76 69 73 69 6f 6e | 73 5d 20 28 22 52 65 76 |revision|s] ("Rev|
|00000340| 69 73 69 6f 6e 73 2e 2e | 2e 22 20 2e 20 65 6d 65 |isions..|." . eme|
|00000350| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 29 20 5b |rge-revi|sions) [|
|00000360| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|00000370| 68 2d 61 6e 63 65 73 74 | 6f 72 5d 20 28 22 46 69 |h-ancest|or] ("Fi|
|00000380| 6c 65 73 20 77 69 74 68 | 20 41 6e 63 65 73 74 6f |les with| Ancesto|
|00000390| 72 2e 2e 2e 22 20 2e 20 | 65 6d 65 72 67 65 2d 66 |r..." . |emerge-f|
|000003a0| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|000003b0| 6f 72 29 20 5b 65 6d 65 | 72 67 65 2d 66 69 6c 65 |or) [eme|rge-file|
|000003c0| 73 5d 20 28 22 46 69 6c | 65 73 2e 2e 2e 22 20 2e |s] ("Fil|es..." .|
|000003d0| 20 65 6d 65 72 67 65 2d | 66 69 6c 65 73 29 20 5b | emerge-|files) [|
|000003e0| 65 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 2d 77 |emerge-b|uffers-w|
|000003f0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 5d 20 28 22 |ith-ance|stor] ("|
|00000400| 42 75 66 66 65 72 73 20 | 77 69 74 68 20 41 6e 63 |Buffers |with Anc|
|00000410| 65 73 74 6f 72 2e 2e 2e | 22 20 2e 20 65 6d 65 72 |estor...|" . emer|
|00000420| 67 65 2d 62 75 66 66 65 | 72 73 2d 77 69 74 68 2d |ge-buffe|rs-with-|
|00000430| 61 6e 63 65 73 74 6f 72 | 29 20 5b 65 6d 65 72 67 |ancestor|) [emerg|
|00000440| 65 2d 62 75 66 66 65 72 | 73 5d 20 28 22 42 75 66 |e-buffer|s] ("Buf|
|00000450| 66 65 72 73 2e 2e 2e 22 | 20 2e 20 65 6d 65 72 67 |fers..."| . emerg|
|00000460| 65 2d 62 75 66 66 65 72 | 73 29 5d 20 34 29 0a 23 |e-buffer|s)] 4).#|
|00000470| 40 31 34 36 20 4d 61 63 | 72 6f 20 74 6f 20 73 77 |@146 Mac|ro to sw|
|00000480| 69 74 63 68 20 74 6f 20 | 42 55 46 46 45 52 2c 20 |itch to |BUFFER, |
|00000490| 65 76 61 6c 75 61 74 65 | 20 46 4f 52 4d 53 2c 20 |evaluate| FORMS, |
|000004a0| 72 65 74 75 72 6e 73 20 | 74 6f 20 6f 72 69 67 69 |returns |to origi|
|000004b0| 6e 61 6c 20 62 75 66 66 | 65 72 2e 0a 44 69 66 66 |nal buff|er..Diff|
|000004c0| 65 72 73 20 66 72 6f 6d | 20 60 73 61 76 65 2d 65 |ers from| `save-e|
|000004d0| 78 63 75 72 73 69 6f 6e | 27 20 69 6e 20 74 68 61 |xcursion|' in tha|
|000004e0| 74 20 69 74 20 64 6f 65 | 73 6e 27 74 20 73 61 76 |t it doe|sn't sav|
|000004f0| 65 20 74 68 65 20 70 6f | 69 6e 74 20 61 6e 64 20 |e the po|int and |
|00000500| 6d 61 72 6b 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |mark...(|defalias|
|00000510| 20 27 65 6d 65 72 67 65 | 2d 65 76 61 6c 2d 69 6e | 'emerge|-eval-in|
|00000520| 2d 62 75 66 66 65 72 20 | 27 28 6d 61 63 72 6f 20 |-buffer |'(macro |
|00000530| 2e 20 23 5b 28 62 75 66 | 66 65 72 20 26 72 65 73 |. #[(buf|fer &res|
|00000540| 74 20 66 6f 72 6d 73 29 | 20 22 c0 c1 c2 c3 c4 0d |t forms)| "......|
|00000550| 44 0e 06 42 42 c7 42 42 | 45 87 22 20 5b 6c 65 74 |D..BB.BB|E." [let|
|00000560| 20 28 28 53 74 61 72 74 | 42 75 66 66 65 72 20 28 | ((Start|Buffer (|
|00000570| 63 75 72 72 65 6e 74 2d | 62 75 66 66 65 72 29 29 |current-|buffer))|
|00000580| 29 20 75 6e 77 69 6e 64 | 2d 70 72 6f 74 65 63 74 |) unwind|-protect|
|00000590| 20 70 72 6f 67 6e 20 73 | 65 74 2d 62 75 66 66 65 | progn s|et-buffe|
|000005a0| 72 20 62 75 66 66 65 72 | 20 66 6f 72 6d 73 20 28 |r buffer| forms (|
|000005b0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000005c0| 74 42 75 66 66 65 72 29 | 29 5d 20 36 20 28 23 24 |tBuffer)|)] 6 (#$|
|000005d0| 20 2e 20 31 31 34 31 29 | 5d 29 29 0a 23 40 32 37 | . 1141)|])).#@27|
|000005e0| 37 20 44 65 66 69 6e 65 | 73 20 53 59 4d 42 4f 4c |7 Define|s SYMBOL|
|000005f0| 20 61 73 20 61 6e 20 61 | 64 76 65 72 74 69 73 65 | as an a|dvertise|
|00000600| 64 20 76 61 72 69 61 62 | 6c 65 2e 20 20 0a 50 65 |d variab|le. .Pe|
|00000610| 72 66 6f 72 6d 73 20 61 | 20 64 65 66 76 61 72 2c |rforms a| defvar,|
|00000620| 20 74 68 65 6e 20 65 78 | 65 63 75 74 65 73 20 60 | then ex|ecutes `|
|00000630| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00000640| 66 66 65 72 2d 6c 6f 63 | 61 6c 27 20 6f 6e 0a 74 |ffer-loc|al' on.t|
|00000650| 68 65 20 76 61 72 69 61 | 62 6c 65 2e 20 20 41 6c |he varia|ble. Al|
|00000660| 73 6f 20 73 65 74 73 20 | 74 68 65 20 60 70 72 65 |so sets |the `pre|
|00000670| 73 65 72 76 65 64 27 20 | 70 72 6f 70 65 72 74 79 |served' |property|
|00000680| 2c 20 73 6f 20 74 68 61 | 74 0a 60 6b 69 6c 6c 2d |, so tha|t.`kill-|
|00000690| 61 6c 6c 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |all-loca|l-variab|
|000006a0| 6c 65 73 27 20 28 63 61 | 6c 6c 65 64 20 62 79 20 |les' (ca|lled by |
|000006b0| 6d 61 6a 6f 72 2d 6d 6f | 64 65 20 73 65 74 74 69 |major-mo|de setti|
|000006c0| 6e 67 20 63 6f 6d 6d 61 | 6e 64 73 29 20 0a 77 6f |ng comma|nds) .wo|
|000006d0| 6e 27 74 20 64 65 73 74 | 72 6f 79 20 45 6d 65 72 |n't dest|roy Emer|
|000006e0| 67 65 20 63 6f 6e 74 72 | 6f 6c 20 76 61 72 69 61 |ge contr|ol varia|
|000006f0| 62 6c 65 73 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |bles...(|defalias|
|00000700| 20 27 65 6d 65 72 67 65 | 2d 64 65 66 76 61 72 2d | 'emerge|-defvar-|
|00000710| 6c 6f 63 61 6c 20 27 28 | 6d 61 63 72 6f 20 2e 20 |local '(|macro . |
|00000720| 23 5b 28 76 61 72 20 76 | 61 6c 75 65 20 64 6f 63 |#[(var v|alue doc|
|00000730| 29 20 22 c0 c1 5c 6e 0b | 5c 66 46 c5 c6 5c 6e 44 |) "..\n.|\fF..\nD|
|00000740| 44 c7 c6 5c 6e 44 c8 42 | 42 46 87 22 20 5b 70 72 |D..\nD.B|BF." [pr|
|00000750| 6f 67 6e 20 64 65 66 76 | 61 72 20 76 61 72 20 76 |ogn defv|ar var v|
|00000760| 61 6c 75 65 20 64 6f 63 | 20 6d 61 6b 65 2d 76 61 |alue doc| make-va|
|00000770| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00000780| 63 61 6c 20 71 75 6f 74 | 65 20 70 75 74 20 28 28 |cal quot|e put ((|
|00000790| 71 75 6f 74 65 20 70 72 | 65 73 65 72 76 65 64 29 |quote pr|eserved)|
|000007a0| 20 74 29 5d 20 36 20 28 | 23 24 20 2e 20 31 35 30 | t)] 6 (|#$ . 150|
|000007b0| 36 29 5d 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |6)])).(b|yte-code|
|000007c0| 20 22 c0 c1 21 84 08 00 | c2 11 c1 0b 42 13 c4 0d | "..!...|....B...|
|000007d0| 9e 84 17 00 c6 09 0d 5c | 22 15 c0 87 22 20 5b 62 |.......\|"..." [b|
|000007e0| 6f 75 6e 64 70 20 65 6d | 65 72 67 65 2d 6d 69 6e |oundp em|erge-min|
|000007f0| 6f 72 2d 6d 6f 64 65 73 | 2d 6c 69 73 74 20 28 28 |or-modes|-list ((|
|00000800| 65 6d 65 72 67 65 2d 6d | 6f 64 65 20 22 20 45 6d |emerge-m|ode " Em|
|00000810| 65 72 67 65 22 29 20 28 | 65 6d 65 72 67 65 2d 66 |erge") (|emerge-f|
|00000820| 61 73 74 2d 6d 6f 64 65 | 20 22 20 46 22 29 20 28 |ast-mode| " F") (|
|00000830| 65 6d 65 72 67 65 2d 65 | 64 69 74 2d 6d 6f 64 65 |emerge-e|dit-mode|
|00000840| 20 22 20 45 22 29 20 28 | 65 6d 65 72 67 65 2d 61 | " E") (|emerge-a|
|00000850| 75 74 6f 2d 61 64 76 61 | 6e 63 65 20 22 20 41 22 |uto-adva|nce " A"|
|00000860| 29 20 28 65 6d 65 72 67 | 65 2d 73 6b 69 70 2d 70 |) (emerg|e-skip-p|
|00000870| 72 65 66 65 72 73 20 22 | 20 53 22 29 29 20 63 75 |refers "| S")) cu|
|00000880| 72 72 65 6e 74 2d 6c 6f | 61 64 2d 6c 69 73 74 20 |rrent-lo|ad-list |
|00000890| 65 6d 65 72 67 65 2d 6d | 6f 64 65 20 6d 69 6e 6f |emerge-m|ode mino|
|000008a0| 72 2d 6d 6f 64 65 2d 61 | 6c 69 73 74 20 61 70 70 |r-mode-a|list app|
|000008b0| 65 6e 64 5d 20 33 29 0a | 23 40 34 39 31 20 45 6d |end] 3).|#@491 Em|
|000008c0| 65 72 67 65 20 6d 6f 64 | 65 20 69 73 20 75 73 65 |erge mod|e is use|
|000008d0| 64 20 62 79 20 74 68 65 | 20 45 6d 65 72 67 65 20 |d by the| Emerge |
|000008e0| 66 69 6c 65 2d 6d 65 72 | 67 69 6e 67 20 70 61 63 |file-mer|ging pac|
|000008f0| 6b 61 67 65 2e 0a 49 74 | 20 69 73 20 65 6e 74 65 |kage..It| is ente|
|00000900| 72 65 64 20 6f 6e 6c 79 | 20 74 68 72 6f 75 67 68 |red only| through|
|00000910| 20 6f 6e 65 20 6f 66 20 | 74 68 65 20 66 75 6e 63 | one of |the func|
|00000920| 74 69 6f 6e 73 3a 0a 09 | 60 65 6d 65 72 67 65 2d |tions:..|`emerge-|
|00000930| 66 69 6c 65 73 27 0a 09 | 60 65 6d 65 72 67 65 2d |files'..|`emerge-|
|00000940| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00000950| 74 6f 72 27 0a 09 60 65 | 6d 65 72 67 65 2d 62 75 |tor'..`e|merge-bu|
|00000960| 66 66 65 72 73 27 0a 09 | 60 65 6d 65 72 67 65 2d |ffers'..|`emerge-|
|00000970| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|00000980| 65 73 74 6f 72 27 0a 09 | 60 65 6d 65 72 67 65 2d |estor'..|`emerge-|
|00000990| 66 69 6c 65 73 2d 63 6f | 6d 6d 61 6e 64 27 0a 09 |files-co|mmand'..|
|000009a0| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |`emerge-|files-wi|
|000009b0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 63 6f 6d 6d |th-ances|tor-comm|
|000009c0| 61 6e 64 27 0a 09 60 65 | 6d 65 72 67 65 2d 66 69 |and'..`e|merge-fi|
|000009d0| 6c 65 73 2d 72 65 6d 6f | 74 65 27 0a 09 60 65 6d |les-remo|te'..`em|
|000009e0| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|000009f0| 61 6e 63 65 73 74 6f 72 | 2d 72 65 6d 6f 74 65 27 |ancestor|-remote'|
|00000a00| 0a 0a 43 6f 6d 6d 61 6e | 64 73 3a 0a 5c 7b 65 6d |..Comman|ds:.\{em|
|00000a10| 65 72 67 65 2d 62 61 73 | 69 63 2d 6b 65 79 6d 61 |erge-bas|ic-keyma|
|00000a20| 70 7d 0a 43 6f 6d 6d 61 | 6e 64 73 20 6d 75 73 74 |p}.Comma|nds must|
|00000a30| 20 62 65 20 70 72 65 66 | 69 78 65 64 20 62 79 20 | be pref|ixed by |
|00000a40| 5c 3c 65 6d 65 72 67 65 | 2d 66 61 73 74 2d 6b 65 |\<emerge|-fast-ke|
|00000a50| 79 6d 61 70 3e 5c 5b 65 | 6d 65 72 67 65 2d 62 61 |ymap>\[e|merge-ba|
|00000a60| 73 69 63 2d 6b 65 79 6d | 61 70 5d 20 69 6e 20 60 |sic-keym|ap] in `|
|00000a70| 65 64 69 74 27 20 6d 6f | 64 65 2c 0a 62 75 74 20 |edit' mo|de,.but |
|00000a80| 63 61 6e 20 62 65 20 69 | 6e 76 6f 6b 65 64 20 64 |can be i|nvoked d|
|00000a90| 69 72 65 63 74 6c 79 20 | 69 6e 20 60 66 61 73 74 |irectly |in `fast|
|00000aa0| 27 20 6d 6f 64 65 2e 1f | 0a 28 64 65 66 61 6c 69 |' mode..|.(defali|
|00000ab0| 61 73 20 27 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |as 'emer|ge-mode |
|00000ac0| 23 5b 6e 69 6c 20 22 c0 | 87 22 20 5b 6e 69 6c 5d |#[nil ".|." [nil]|
|00000ad0| 20 31 20 28 23 24 20 2e | 20 32 32 33 38 29 5d 29 | 1 (#$ .| 2238)])|
|00000ae0| 0a 23 40 32 34 20 54 68 | 65 20 76 65 72 73 69 6f |.#@24 Th|e versio|
|00000af0| 6e 20 6f 66 20 45 6d 65 | 72 67 65 2e 1f 0a 28 64 |n of Eme|rge...(d|
|00000b00| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 76 65 72 |efvar em|erge-ver|
|00000b10| 73 69 6f 6e 20 22 35 66 | 73 66 22 20 28 23 24 20 |sion "5f|sf" (#$ |
|00000b20| 2e 20 32 37 39 30 29 29 | 0a 23 40 39 38 20 52 65 |. 2790))|.#@98 Re|
|00000b30| 74 75 72 6e 20 73 74 72 | 69 6e 67 20 64 65 73 63 |turn str|ing desc|
|00000b40| 72 69 62 69 6e 67 20 74 | 68 65 20 76 65 72 73 69 |ribing t|he versi|
|00000b50| 6f 6e 20 6f 66 20 45 6d | 65 72 67 65 2e 0a 57 68 |on of Em|erge..Wh|
|00000b60| 65 6e 20 63 61 6c 6c 65 | 64 20 69 6e 74 65 72 61 |en calle|d intera|
|00000b70| 63 74 69 76 65 6c 79 2c | 20 64 69 73 70 6c 61 79 |ctively,| display|
|00000b80| 73 20 74 68 65 20 76 65 | 72 73 69 6f 6e 2e 1f 0a |s the ve|rsion...|
|00000b90| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00000ba0| 65 2d 76 65 72 73 69 6f | 6e 20 23 5b 6e 69 6c 20 |e-versio|n #[nil |
|00000bb0| 22 74 83 5c 6e 00 c0 c1 | c2 20 5c 22 87 5c 6e 87 |"t.\n...|. \".\n.|
|00000bc0| 22 20 5b 6d 65 73 73 61 | 67 65 20 22 45 6d 65 72 |" [messa|ge "Emer|
|00000bd0| 67 65 20 76 65 72 73 69 | 6f 6e 20 25 73 22 20 65 |ge versi|on %s" e|
|00000be0| 6d 65 72 67 65 2d 76 65 | 72 73 69 6f 6e 5d 20 33 |merge-ve|rsion] 3|
|00000bf0| 20 28 23 24 20 2e 20 32 | 38 36 32 29 20 6e 69 6c | (#$ . 2|862) nil|
|00000c00| 5d 29 0a 23 40 34 38 20 | 2a 4e 61 6d 65 20 6f 66 |]).#@48 |*Name of|
|00000c10| 20 74 68 65 20 70 72 6f | 67 72 61 6d 20 77 68 69 | the pro|gram whi|
|00000c20| 63 68 20 63 6f 6d 70 61 | 72 65 73 20 74 77 6f 20 |ch compa|res two |
|00000c30| 66 69 6c 65 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |files...|(defvar |
|00000c40| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 70 72 6f 67 |emerge-d|iff-prog|
|00000c50| 72 61 6d 20 22 64 69 66 | 66 22 20 28 23 24 20 2e |ram "dif|f" (#$ .|
|00000c60| 20 2d 33 30 38 30 29 29 | 0a 23 40 31 31 33 20 2a | -3080))|.#@113 *|
|00000c70| 4e 61 6d 65 20 6f 66 20 | 74 68 65 20 70 72 6f 67 |Name of |the prog|
|00000c80| 72 61 6d 20 77 68 69 63 | 68 20 63 6f 6d 70 61 72 |ram whic|h compar|
|00000c90| 65 73 20 74 68 72 65 65 | 20 66 69 6c 65 73 2e 0a |es three| files..|
|00000ca0| 49 74 73 20 61 72 67 75 | 6d 65 6e 74 73 20 61 72 |Its argu|ments ar|
|00000cb0| 65 20 74 68 65 20 61 6e | 63 65 73 74 6f 72 20 66 |e the an|cestor f|
|00000cc0| 69 6c 65 20 61 6e 64 20 | 74 68 65 20 74 77 6f 20 |ile and |the two |
|00000cd0| 76 61 72 69 61 6e 74 20 | 66 69 6c 65 73 2e 1f 0a |variant |files...|
|00000ce0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000cf0| 69 66 66 33 2d 70 72 6f | 67 72 61 6d 20 22 64 69 |iff3-pro|gram "di|
|00000d00| 66 66 33 22 20 28 23 24 | 20 2e 20 2d 33 31 38 33 |ff3" (#$| . -3183|
|00000d10| 29 29 0a 23 40 37 31 20 | 2a 4f 70 74 69 6f 6e 73 |)).#@71 |*Options|
|00000d20| 20 74 6f 20 70 61 73 73 | 20 74 6f 20 60 65 6d 65 | to pass| to `eme|
|00000d30| 72 67 65 2d 64 69 66 66 | 2d 70 72 6f 67 72 61 6d |rge-diff|-program|
|00000d40| 27 20 61 6e 64 20 60 65 | 6d 65 72 67 65 2d 64 69 |' and `e|merge-di|
|00000d50| 66 66 33 2d 70 72 6f 67 | 72 61 6d 27 2e 1f 0a 28 |ff3-prog|ram'...(|
|00000d60| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 64 69 |defvar e|merge-di|
|00000d70| 66 66 2d 6f 70 74 69 6f | 6e 73 20 22 22 20 28 23 |ff-optio|ns "" (#|
|00000d80| 24 20 2e 20 2d 33 33 35 | 32 29 29 0a 23 40 31 32 |$ . -335|2)).#@12|
|00000d90| 30 20 2a 50 61 74 74 65 | 72 6e 20 74 6f 20 6d 61 |0 *Patte|rn to ma|
|00000da0| 74 63 68 20 6c 69 6e 65 | 73 20 70 72 6f 64 75 63 |tch line|s produc|
|00000db0| 65 64 20 62 79 20 64 69 | 66 66 20 74 68 61 74 20 |ed by di|ff that |
|00000dc0| 64 65 73 63 72 69 62 65 | 20 64 69 66 66 65 72 65 |describe| differe|
|00000dd0| 6e 63 65 73 2e 0a 54 68 | 69 73 20 69 73 20 61 73 |nces..Th|is is as|
|00000de0| 20 6f 70 70 6f 73 65 64 | 20 74 6f 20 6c 69 6e 65 | opposed| to line|
|00000df0| 73 20 66 72 6f 6d 20 74 | 68 65 20 73 6f 75 72 63 |s from t|he sourc|
|00000e00| 65 20 66 69 6c 65 73 2e | 1f 0a 28 64 65 66 76 61 |e files.|..(defva|
|00000e10| 72 20 65 6d 65 72 67 65 | 2d 6d 61 74 63 68 2d 64 |r emerge|-match-d|
|00000e20| 69 66 66 2d 6c 69 6e 65 | 20 28 62 79 74 65 2d 63 |iff-line| (byte-c|
|00000e30| 6f 64 65 20 22 c0 19 c2 | 09 c3 09 c4 b0 05 29 87 |ode "...|......).|
|00000e40| 22 20 5b 22 5c 5c 28 5b | 30 2d 39 5d 2b 5c 5c 29 |" ["\\([|0-9]+\\)|
|00000e50| 5c 5c 28 5c 5c 7c 2c 5c | 5c 28 5b 30 2d 39 5d 2b |\\(\\|,\|\([0-9]+|
|00000e60| 5c 5c 29 5c 5c 29 22 20 | 78 20 22 5e 22 20 22 5c |\\)\\)" |x "^" "\|
|00000e70| 5c 28 5b 61 63 64 5d 5c | 5c 29 22 20 22 24 22 5d |\([acd]\|\)" "$"]|
|00000e80| 20 35 29 20 28 23 24 20 | 2e 20 2d 33 34 37 34 29 | 5) (#$ |. -3474)|
|00000e90| 29 0a 23 40 31 32 38 20 | 2a 52 65 67 65 78 70 20 |).#@128 |*Regexp |
|00000ea0| 74 68 61 74 20 6d 61 74 | 63 68 65 73 20 6e 6f 72 |that mat|ches nor|
|00000eb0| 6d 61 6c 20 6f 75 74 70 | 75 74 20 6c 69 6e 65 73 |mal outp|ut lines|
|00000ec0| 20 66 72 6f 6d 20 60 65 | 6d 65 72 67 65 2d 64 69 | from `e|merge-di|
|00000ed0| 66 66 2d 70 72 6f 67 72 | 61 6d 27 2e 0a 4c 69 6e |ff-progr|am'..Lin|
|00000ee0| 65 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 20 6d |es that |do not m|
|00000ef0| 61 74 63 68 20 61 72 65 | 20 61 73 73 75 6d 65 64 |atch are| assumed|
|00000f00| 20 74 6f 20 62 65 20 65 | 72 72 6f 72 20 6d 65 73 | to be e|rror mes|
|00000f10| 73 61 67 65 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |sages...|(defvar |
|00000f20| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 6f 6b 2d 6c |emerge-d|iff-ok-l|
|00000f30| 69 6e 65 73 2d 72 65 67 | 65 78 70 20 22 5e 5c 5c |ines-reg|exp "^\\|
|00000f40| 28 5b 30 2d 39 2c 5d 2b | 5b 61 63 64 5d 5b 30 2d |([0-9,]+|[acd][0-|
|00000f50| 39 2c 5d 2b 24 5c 5c 7c | 5b 3c 3e 5d 20 5c 5c 7c |9,]+$\\||[<>] \\||
|00000f60| 2d 2d 2d 5c 5c 29 22 20 | 28 23 24 20 2e 20 2d 33 |---\\)" |(#$ . -3|
|00000f70| 37 33 36 29 29 0a 23 40 | 31 32 39 20 2a 52 65 67 |736)).#@|129 *Reg|
|00000f80| 65 78 70 20 74 68 61 74 | 20 6d 61 74 63 68 65 73 |exp that| matches|
|00000f90| 20 6e 6f 72 6d 61 6c 20 | 6f 75 74 70 75 74 20 6c | normal |output l|
|00000fa0| 69 6e 65 73 20 66 72 6f | 6d 20 60 65 6d 65 72 67 |ines fro|m `emerg|
|00000fb0| 65 2d 64 69 66 66 33 2d | 70 72 6f 67 72 61 6d 27 |e-diff3-|program'|
|00000fc0| 2e 0a 4c 69 6e 65 73 20 | 74 68 61 74 20 64 6f 20 |..Lines |that do |
|00000fd0| 6e 6f 74 20 6d 61 74 63 | 68 20 61 72 65 20 61 73 |not matc|h are as|
|00000fe0| 73 75 6d 65 64 20 74 6f | 20 62 65 20 65 72 72 6f |sumed to| be erro|
|00000ff0| 72 20 6d 65 73 73 61 67 | 65 73 2e 1f 0a 28 64 65 |r messag|es...(de|
|00001000| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |fvar eme|rge-diff|
|00001010| 33 2d 6f 6b 2d 6c 69 6e | 65 73 2d 72 65 67 65 78 |3-ok-lin|es-regex|
|00001020| 70 20 22 5e 5c 5c 28 5b | 31 2d 33 5d 3a 5c 5c 7c |p "^\\([|1-3]:\\||
|00001030| 3d 3d 3d 3d 5c 5c 7c 20 | 20 5c 5c 29 22 20 28 23 |====\\| | \\)" (#|
|00001040| 24 20 2e 20 2d 33 39 36 | 34 29 29 0a 23 40 35 32 |$ . -396|4)).#@52|
|00001050| 20 2a 4e 61 6d 65 20 6f | 66 20 74 68 65 20 70 72 | *Name o|f the pr|
|00001060| 6f 67 72 61 6d 20 74 68 | 61 74 20 63 68 65 63 6b |ogram th|at check|
|00001070| 73 20 69 6e 20 52 43 53 | 20 72 65 76 69 73 69 6f |s in RCS| revisio|
|00001080| 6e 73 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |ns...(de|fvar eme|
|00001090| 72 67 65 2d 72 63 73 2d | 63 69 2d 70 72 6f 67 72 |rge-rcs-|ci-progr|
|000010a0| 61 6d 20 22 63 69 22 20 | 28 23 24 20 2e 20 2d 34 |am "ci" |(#$ . -4|
|000010b0| 31 37 37 29 29 0a 23 40 | 35 33 20 2a 4e 61 6d 65 |177)).#@|53 *Name|
|000010c0| 20 6f 66 20 74 68 65 20 | 70 72 6f 67 72 61 6d 20 | of the |program |
|000010d0| 74 68 61 74 20 63 68 65 | 63 6b 73 20 6f 75 74 20 |that che|cks out |
|000010e0| 52 43 53 20 72 65 76 69 | 73 69 6f 6e 73 2e 1f 0a |RCS revi|sions...|
|000010f0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 72 |(defvar |emerge-r|
|00001100| 63 73 2d 63 6f 2d 70 72 | 6f 67 72 61 6d 20 22 63 |cs-co-pr|ogram "c|
|00001110| 6f 22 20 28 23 24 20 2e | 20 2d 34 32 38 33 29 29 |o" (#$ .| -4283))|
|00001120| 0a 23 40 31 37 34 20 2a | 4e 6f 6e 2d 6e 69 6c 20 |.#@174 *|Non-nil |
|00001130| 69 66 20 45 6d 65 72 67 | 65 20 73 68 6f 75 6c 64 |if Emerg|e should|
|00001140| 20 70 72 6f 63 65 73 73 | 20 6c 6f 63 61 6c 2d 76 | process| local-v|
|00001150| 61 72 69 61 62 6c 65 73 | 20 6c 69 73 74 73 20 69 |ariables| lists i|
|00001160| 6e 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 73 2e |n merge |buffers.|
|00001170| 0a 28 59 6f 75 20 63 61 | 6e 20 65 78 70 6c 69 63 |.(You ca|n explic|
|00001180| 69 74 6c 79 20 72 65 71 | 75 65 73 74 20 70 72 6f |itly req|uest pro|
|00001190| 63 65 73 73 69 6e 67 20 | 74 68 65 20 6c 6f 63 61 |cessing |the loca|
|000011a0| 6c 2d 76 61 72 69 61 62 | 6c 65 73 0a 62 79 20 65 |l-variab|les.by e|
|000011b0| 78 65 63 75 74 69 6e 67 | 20 60 28 68 61 63 6b 2d |xecuting| `(hack-|
|000011c0| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 29 |local-va|riables)|
|000011d0| 27 2e 29 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |'.)..(de|fvar eme|
|000011e0| 72 67 65 2d 70 72 6f 63 | 65 73 73 2d 6c 6f 63 61 |rge-proc|ess-loca|
|000011f0| 6c 2d 76 61 72 69 61 62 | 6c 65 73 20 6e 69 6c 20 |l-variab|les nil |
|00001200| 28 23 24 20 2e 20 2d 34 | 33 39 31 29 29 0a 23 40 |(#$ . -4|391)).#@|
|00001210| 33 33 39 20 2a 49 66 20 | 6e 6f 6e 2d 6e 69 6c 3a |339 *If |non-nil:|
|00001220| 20 60 65 6d 65 72 67 65 | 2d 65 78 65 63 75 74 65 | `emerge|-execute|
|00001230| 2d 6c 69 6e 65 27 20 6d | 61 6b 65 73 20 6e 6f 20 |-line' m|akes no |
|00001240| 6f 75 74 70 75 74 20 69 | 66 20 61 6e 20 69 6e 70 |output i|f an inp|
|00001250| 75 74 20 77 61 73 20 64 | 65 6c 65 74 65 64 2e 0a |ut was d|eleted..|
|00001260| 49 74 20 63 6f 6e 63 6c | 75 64 65 73 20 74 68 61 |It concl|udes tha|
|00001270| 74 20 61 6e 20 69 6e 70 | 75 74 20 76 65 72 73 69 |t an inp|ut versi|
|00001280| 6f 6e 20 68 61 73 20 62 | 65 65 6e 20 64 65 6c 65 |on has b|een dele|
|00001290| 74 65 64 20 77 68 65 6e | 20 61 6e 20 61 6e 63 65 |ted when| an ance|
|000012a0| 73 74 6f 72 20 65 6e 74 | 72 79 0a 69 73 20 70 72 |stor ent|ry.is pr|
|000012b0| 65 73 65 6e 74 2c 20 6f | 6e 6c 79 20 6f 6e 65 20 |esent, o|nly one |
|000012c0| 41 20 6f 72 20 42 20 65 | 6e 74 72 79 20 69 73 20 |A or B e|ntry is |
|000012d0| 70 72 65 73 65 6e 74 2c | 20 61 6e 64 20 61 6e 20 |present,| and an |
|000012e0| 6f 75 74 70 75 74 20 65 | 6e 74 72 79 20 69 73 20 |output e|ntry is |
|000012f0| 70 72 65 73 65 6e 74 2e | 0a 49 66 20 6e 69 6c 3a |present.|.If nil:|
|00001300| 20 49 6e 20 73 75 63 68 | 20 63 69 72 63 75 6d 73 | In such| circums|
|00001310| 74 61 6e 63 65 73 2c 20 | 74 68 65 20 41 20 6f 72 |tances, |the A or|
|00001320| 20 42 20 66 69 6c 65 20 | 74 68 61 74 20 69 73 20 | B file |that is |
|00001330| 70 72 65 73 65 6e 74 20 | 77 69 6c 6c 20 62 65 0a |present |will be.|
|00001340| 63 6f 70 69 65 64 20 74 | 6f 20 74 68 65 20 64 65 |copied t|o the de|
|00001350| 73 69 67 6e 61 74 65 64 | 20 6f 75 74 70 75 74 20 |signated| output |
|00001360| 66 69 6c 65 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |file...(|defvar e|
|00001370| 6d 65 72 67 65 2d 65 78 | 65 63 75 74 65 2d 6c 69 |merge-ex|ecute-li|
|00001380| 6e 65 2d 64 65 6c 65 74 | 69 6f 6e 73 20 6e 69 6c |ne-delet|ions nil|
|00001390| 20 28 23 24 20 2e 20 2d | 34 36 32 38 29 29 0a 23 | (#$ . -|4628)).#|
|000013a0| 40 31 36 31 20 2a 46 6c | 61 67 20 70 6c 61 63 65 |@161 *Fl|ag place|
|000013b0| 64 20 61 62 6f 76 65 20 | 74 68 65 20 68 69 67 68 |d above |the high|
|000013c0| 6c 69 67 68 74 65 64 20 | 62 6c 6f 63 6b 20 6f 66 |lighted |block of|
|000013d0| 20 63 6f 64 65 2e 20 20 | 4d 75 73 74 20 65 6e 64 | code. |Must end|
|000013e0| 20 77 69 74 68 20 6e 65 | 77 6c 69 6e 65 2e 0a 4d | with ne|wline..M|
|000013f0| 75 73 74 20 62 65 20 73 | 65 74 20 62 65 66 6f 72 |ust be s|et befor|
|00001400| 65 20 45 6d 65 72 67 65 | 20 69 73 20 6c 6f 61 64 |e Emerge| is load|
|00001410| 65 64 2c 20 6f 72 20 20 | 65 6d 65 72 67 65 2d 6e |ed, or |emerge-n|
|00001420| 65 77 2d 66 6c 61 67 73 | 20 20 6d 75 73 74 20 62 |ew-flags| must b|
|00001430| 65 20 72 75 6e 0a 61 66 | 74 65 72 20 73 65 74 74 |e run.af|ter sett|
|00001440| 69 6e 67 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |ing...(d|efvar em|
|00001450| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|00001460| 20 22 76 76 76 76 76 76 | 76 76 76 76 76 76 76 76 | "vvvvvv|vvvvvvvv|
|00001470| 76 76 76 76 76 76 5c 6e | 22 20 28 23 24 20 2e 20 |vvvvvv\n|" (#$ . |
|00001480| 2d 35 30 32 39 29 29 0a | 23 40 31 36 31 20 2a 46 |-5029)).|#@161 *F|
|00001490| 6c 61 67 20 70 6c 61 63 | 65 64 20 62 65 6c 6f 77 |lag plac|ed below|
|000014a0| 20 74 68 65 20 68 69 67 | 68 6c 69 67 68 74 65 64 | the hig|hlighted|
|000014b0| 20 62 6c 6f 63 6b 20 6f | 66 20 63 6f 64 65 2e 20 | block o|f code. |
|000014c0| 20 4d 75 73 74 20 65 6e | 64 20 77 69 74 68 20 6e | Must en|d with n|
|000014d0| 65 77 6c 69 6e 65 2e 0a | 4d 75 73 74 20 62 65 20 |ewline..|Must be |
|000014e0| 73 65 74 20 62 65 66 6f | 72 65 20 45 6d 65 72 67 |set befo|re Emerg|
|000014f0| 65 20 69 73 20 6c 6f 61 | 64 65 64 2c 20 6f 72 20 |e is loa|ded, or |
|00001500| 20 65 6d 65 72 67 65 2d | 6e 65 77 2d 66 6c 61 67 | emerge-|new-flag|
|00001510| 73 20 20 6d 75 73 74 20 | 62 65 20 72 75 6e 0a 61 |s must |be run.a|
|00001520| 66 74 65 72 20 73 65 74 | 74 69 6e 67 2e 1f 0a 28 |fter set|ting...(|
|00001530| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 61 66 |defvar e|merge-af|
|00001540| 74 65 72 2d 66 6c 61 67 | 20 22 5e 5e 5e 5e 5e 5e |ter-flag| "^^^^^^|
|00001550| 5e 5e 5e 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5c 6e |^^^^^^^^|^^^^^^\n|
|00001560| 22 20 28 23 24 20 2e 20 | 2d 35 32 36 32 29 29 0a |" (#$ . |-5262)).|
|00001570| 23 40 36 37 20 2a 48 6f | 6f 6b 20 74 6f 20 72 75 |#@67 *Ho|ok to ru|
|00001580| 6e 20 69 6e 20 74 68 65 | 20 6d 65 72 67 65 20 62 |n in the| merge b|
|00001590| 75 66 66 65 72 20 61 66 | 74 65 72 20 74 68 65 20 |uffer af|ter the |
|000015a0| 6d 65 72 67 65 20 68 61 | 73 20 62 65 65 6e 20 73 |merge ha|s been s|
|000015b0| 65 74 20 75 70 2e 1f 0a | 28 64 65 66 76 61 72 20 |et up...|(defvar |
|000015c0| 65 6d 65 72 67 65 2d 73 | 74 61 72 74 75 70 2d 68 |emerge-s|tartup-h|
|000015d0| 6f 6f 6b 20 6e 69 6c 20 | 28 23 24 20 2e 20 2d 35 |ook nil |(#$ . -5|
|000015e0| 34 39 33 29 29 0a 23 40 | 31 31 36 20 2a 48 6f 6f |493)).#@|116 *Hoo|
|000015f0| 6b 20 74 6f 20 72 75 6e | 20 61 66 74 65 72 20 61 |k to run| after a|
|00001600| 20 64 69 66 66 65 72 65 | 6e 63 65 20 68 61 73 20 | differe|nce has |
|00001610| 62 65 65 6e 20 73 65 6c | 65 63 74 65 64 2e 0a 54 |been sel|ected..T|
|00001620| 68 65 20 76 61 72 69 61 | 62 6c 65 20 60 6e 27 20 |he varia|ble `n' |
|00001630| 68 6f 6c 64 73 20 74 68 | 65 20 28 69 6e 74 65 72 |holds th|e (inter|
|00001640| 6e 61 6c 29 20 6e 75 6d | 62 65 72 20 6f 66 20 74 |nal) num|ber of t|
|00001650| 68 65 20 64 69 66 66 65 | 72 65 6e 63 65 2e 1f 0a |he diffe|rence...|
|00001660| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 73 |(defvar |emerge-s|
|00001670| 65 6c 65 63 74 2d 68 6f | 6f 6b 20 6e 69 6c 20 28 |elect-ho|ok nil (|
|00001680| 23 24 20 2e 20 2d 35 36 | 31 32 29 29 0a 23 40 31 |#$ . -56|12)).#@1|
|00001690| 31 38 20 2a 48 6f 6f 6b | 20 74 6f 20 72 75 6e 20 |18 *Hook| to run |
|000016a0| 61 66 74 65 72 20 61 20 | 64 69 66 66 65 72 65 6e |after a |differen|
|000016b0| 63 65 20 68 61 73 20 62 | 65 65 6e 20 75 6e 73 65 |ce has b|een unse|
|000016c0| 6c 65 63 74 65 64 2e 0a | 54 68 65 20 76 61 72 69 |lected..|The vari|
|000016d0| 61 62 6c 65 20 60 6e 27 | 20 68 6f 6c 64 73 20 74 |able `n'| holds t|
|000016e0| 68 65 20 28 69 6e 74 65 | 72 6e 61 6c 29 20 6e 75 |he (inte|rnal) nu|
|000016f0| 6d 62 65 72 20 6f 66 20 | 74 68 65 20 64 69 66 66 |mber of |the diff|
|00001700| 65 72 65 6e 63 65 2e 1f | 0a 28 64 65 66 76 61 72 |erence..|.(defvar|
|00001710| 20 65 6d 65 72 67 65 2d | 75 6e 73 65 6c 65 63 74 | emerge-|unselect|
|00001720| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 28 23 24 20 2e 20 |-hook ni|l (#$ . |
|00001730| 2d 35 37 37 39 29 29 0a | 23 40 31 38 39 20 2a 49 |-5779)).|#@189 *I|
|00001740| 66 20 6e 69 6c 2c 20 64 | 65 66 61 75 6c 74 20 64 |f nil, d|efault d|
|00001750| 69 72 20 66 6f 72 20 66 | 69 6c 65 6e 61 6d 65 73 |ir for f|ilenames|
|00001760| 20 69 6e 20 65 6d 65 72 | 67 65 20 69 73 20 60 64 | in emer|ge is `d|
|00001770| 65 66 61 75 6c 74 2d 64 | 69 72 65 63 74 6f 72 79 |efault-d|irectory|
|00001780| 27 2e 0a 49 66 20 6e 6f | 6e 2d 6e 69 6c 2c 20 66 |'..If no|n-nil, f|
|00001790| 69 6c 65 6e 61 6d 65 73 | 20 63 6f 6d 70 6c 65 74 |ilenames| complet|
|000017a0| 65 20 69 6e 20 74 68 65 | 20 64 69 72 65 63 74 6f |e in the| directo|
|000017b0| 72 79 20 6f 66 20 74 68 | 65 20 6c 61 73 74 20 61 |ry of th|e last a|
|000017c0| 72 67 75 6d 65 6e 74 20 | 6f 66 20 74 68 65 0a 73 |rgument |of the.s|
|000017d0| 61 6d 65 20 74 79 70 65 | 20 74 6f 20 61 6e 20 60 |ame type| to an `|
|000017e0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2e 2e 2e 27 |emerge-f|iles...'|
|000017f0| 20 63 6f 6d 6d 61 6e 64 | 2e 1f 0a 28 64 65 66 76 | command|...(defv|
|00001800| 61 72 20 65 6d 65 72 67 | 65 2d 64 65 66 61 75 6c |ar emerg|e-defaul|
|00001810| 74 2d 6c 61 73 74 2d 64 | 69 72 65 63 74 6f 72 69 |t-last-d|irectori|
|00001820| 65 73 20 6e 69 6c 20 28 | 23 24 20 2e 20 2d 35 39 |es nil (|#$ . -59|
|00001830| 35 30 29 29 0a 23 40 36 | 38 20 4c 61 73 74 20 64 |50)).#@6|8 Last d|
|00001840| 69 72 65 63 74 6f 72 79 | 20 66 6f 72 20 74 68 65 |irectory| for the|
|00001850| 20 66 69 72 73 74 20 66 | 69 6c 65 20 6f 66 20 61 | first f|ile of a|
|00001860| 6e 20 60 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2e |n `emerg|e-files.|
|00001870| 2e 2e 27 20 63 6f 6d 6d | 61 6e 64 2e 1f 0a 28 64 |..' comm|and...(d|
|00001880| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 6c 61 73 |efvar em|erge-las|
|00001890| 74 2d 64 69 72 2d 41 20 | 6e 69 6c 20 28 23 24 20 |t-dir-A |nil (#$ |
|000018a0| 2e 20 36 32 30 32 29 29 | 0a 23 40 36 39 20 4c 61 |. 6202))|.#@69 La|
|000018b0| 73 74 20 64 69 72 65 63 | 74 6f 72 79 20 66 6f 72 |st direc|tory for|
|000018c0| 20 74 68 65 20 73 65 63 | 6f 6e 64 20 66 69 6c 65 | the sec|ond file|
|000018d0| 20 6f 66 20 61 6e 20 60 | 65 6d 65 72 67 65 2d 66 | of an `|emerge-f|
|000018e0| 69 6c 65 73 2e 2e 2e 27 | 20 63 6f 6d 6d 61 6e 64 |iles...'| command|
|000018f0| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |...(defv|ar emerg|
|00001900| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 6e 69 6c |e-last-d|ir-B nil|
|00001910| 20 28 23 24 20 2e 20 36 | 33 31 38 29 29 0a 23 40 | (#$ . 6|318)).#@|
|00001920| 37 31 20 4c 61 73 74 20 | 64 69 72 65 63 74 6f 72 |71 Last |director|
|00001930| 79 20 66 6f 72 20 74 68 | 65 20 61 6e 63 65 73 74 |y for th|e ancest|
|00001940| 6f 72 20 66 69 6c 65 20 | 6f 66 20 61 6e 20 60 65 |or file |of an `e|
|00001950| 6d 65 72 67 65 2d 66 69 | 6c 65 73 2e 2e 2e 27 20 |merge-fi|les...' |
|00001960| 63 6f 6d 6d 61 6e 64 2e | 1f 0a 28 64 65 66 76 61 |command.|..(defva|
|00001970| 72 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |r emerge|-last-di|
|00001980| 72 2d 61 6e 63 65 73 74 | 6f 72 20 6e 69 6c 20 28 |r-ancest|or nil (|
|00001990| 23 24 20 2e 20 36 34 33 | 35 29 29 0a 23 40 36 39 |#$ . 643|5)).#@69|
|000019a0| 20 4c 61 73 74 20 64 69 | 72 65 63 74 6f 72 79 20 | Last di|rectory |
|000019b0| 66 6f 72 20 74 68 65 20 | 6f 75 74 70 75 74 20 66 |for the |output f|
|000019c0| 69 6c 65 20 6f 66 20 61 | 6e 20 60 65 6d 65 72 67 |ile of a|n `emerg|
|000019d0| 65 2d 66 69 6c 65 73 2e | 2e 2e 27 20 63 6f 6d 6d |e-files.|..' comm|
|000019e0| 61 6e 64 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |and...(d|efvar em|
|000019f0| 65 72 67 65 2d 6c 61 73 | 74 2d 64 69 72 2d 6f 75 |erge-las|t-dir-ou|
|00001a00| 74 70 75 74 20 6e 69 6c | 20 28 23 24 20 2e 20 36 |tput nil| (#$ . 6|
|00001a10| 35 36 31 29 29 0a 23 40 | 37 36 20 4c 61 73 74 20 |561)).#@|76 Last |
|00001a20| 52 43 53 20 72 65 76 69 | 73 69 6f 6e 20 75 73 65 |RCS revi|sion use|
|00001a30| 64 20 66 6f 72 20 66 69 | 72 73 74 20 66 69 6c 65 |d for fi|rst file|
|00001a40| 20 6f 66 20 61 6e 20 60 | 65 6d 65 72 67 65 2d 72 | of an `|emerge-r|
|00001a50| 65 76 69 73 69 6f 6e 73 | 2e 2e 2e 27 20 63 6f 6d |evisions|...' com|
|00001a60| 6d 61 6e 64 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |mand...(|defvar e|
|00001a70| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 72 65 76 69 73 |merge-la|st-revis|
|00001a80| 69 6f 6e 2d 41 20 6e 69 | 6c 20 28 23 24 20 2e 20 |ion-A ni|l (#$ . |
|00001a90| 36 36 38 33 29 29 0a 23 | 40 37 37 20 4c 61 73 74 |6683)).#|@77 Last|
|00001aa0| 20 52 43 53 20 72 65 76 | 69 73 69 6f 6e 20 75 73 | RCS rev|ision us|
|00001ab0| 65 64 20 66 6f 72 20 73 | 65 63 6f 6e 64 20 66 69 |ed for s|econd fi|
|00001ac0| 6c 65 20 6f 66 20 61 6e | 20 60 65 6d 65 72 67 65 |le of an| `emerge|
|00001ad0| 2d 72 65 76 69 73 69 6f | 6e 73 2e 2e 2e 27 20 63 |-revisio|ns...' c|
|00001ae0| 6f 6d 6d 61 6e 64 2e 1f | 0a 28 64 65 66 76 61 72 |ommand..|.(defvar|
|00001af0| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 72 65 76 | emerge-|last-rev|
|00001b00| 69 73 69 6f 6e 2d 42 20 | 6e 69 6c 20 28 23 24 20 |ision-B |nil (#$ |
|00001b10| 2e 20 36 38 31 32 29 29 | 0a 23 40 37 39 20 4c 61 |. 6812))|.#@79 La|
|00001b20| 73 74 20 52 43 53 20 72 | 65 76 69 73 69 6f 6e 20 |st RCS r|evision |
|00001b30| 75 73 65 64 20 66 6f 72 | 20 61 6e 63 65 73 74 6f |used for| ancesto|
|00001b40| 72 20 66 69 6c 65 20 6f | 66 20 61 6e 20 60 65 6d |r file o|f an `em|
|00001b50| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2e 2e |erge-rev|isions..|
|00001b60| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 1f 0a 28 64 65 |.' comma|nd...(de|
|00001b70| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |fvar eme|rge-last|
|00001b80| 2d 72 65 76 69 73 69 6f | 6e 2d 61 6e 63 65 73 74 |-revisio|n-ancest|
|00001b90| 6f 72 20 6e 69 6c 20 28 | 23 24 20 2e 20 36 39 34 |or nil (|#$ . 694|
|00001ba0| 32 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |2)).(byt|e-code "|
|00001bb0| c0 09 42 11 c2 09 42 11 | c3 09 42 11 c4 09 42 11 |..B...B.|..B...B.|
|00001bc0| c5 09 42 11 c6 09 42 11 | c7 09 42 11 c8 09 42 11 |..B...B.|..B...B.|
|00001bd0| c9 09 42 11 ca 09 42 11 | cb 09 42 11 cc 09 42 11 |..B...B.|..B...B.|
|00001be0| cd 09 42 11 c0 87 22 20 | 5b 65 6d 65 72 67 65 2d |..B..." |[emerge-|
|00001bf0| 62 65 66 6f 72 65 2d 66 | 6c 61 67 2d 6c 65 6e 67 |before-f|lag-leng|
|00001c00| 74 68 20 63 75 72 72 65 | 6e 74 2d 6c 6f 61 64 2d |th curre|nt-load-|
|00001c10| 6c 69 73 74 20 65 6d 65 | 72 67 65 2d 62 65 66 6f |list eme|rge-befo|
|00001c20| 72 65 2d 66 6c 61 67 2d | 6c 69 6e 65 73 20 65 6d |re-flag-|lines em|
|00001c30| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|00001c40| 2d 6d 61 74 63 68 20 65 | 6d 65 72 67 65 2d 61 66 |-match e|merge-af|
|00001c50| 74 65 72 2d 66 6c 61 67 | 2d 6c 65 6e 67 74 68 20 |ter-flag|-length |
|00001c60| 65 6d 65 72 67 65 2d 61 | 66 74 65 72 2d 66 6c 61 |emerge-a|fter-fla|
|00001c70| 67 2d 6c 69 6e 65 73 20 | 65 6d 65 72 67 65 2d 61 |g-lines |emerge-a|
|00001c80| 66 74 65 72 2d 66 6c 61 | 67 2d 6d 61 74 63 68 20 |fter-fla|g-match |
|00001c90| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 62 75 66 66 |emerge-d|iff-buff|
|00001ca0| 65 72 20 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 65 |er emerg|e-diff-e|
|00001cb0| 72 72 6f 72 2d 62 75 66 | 66 65 72 20 65 6d 65 72 |rror-buf|fer emer|
|00001cc0| 67 65 2d 70 72 65 66 69 | 78 2d 61 72 67 75 6d 65 |ge-prefi|x-argume|
|00001cd0| 6e 74 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 2d 6f |nt emerg|e-file-o|
|00001ce0| 75 74 20 65 6d 65 72 67 | 65 2d 65 78 69 74 2d 66 |ut emerg|e-exit-f|
|00001cf0| 75 6e 63 20 65 6d 65 72 | 67 65 2d 67 6c 6f 62 61 |unc emer|ge-globa|
|00001d00| 6c 69 7a 65 64 2d 64 69 | 66 66 65 72 65 6e 63 65 |lized-di|fference|
|00001d10| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 67 6c 6f |-list em|erge-glo|
|00001d20| 62 61 6c 69 7a 65 64 2d | 6e 75 6d 62 65 72 2d 6f |balized-|number-o|
|00001d30| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 73 5d 20 32 |f-differ|ences] 2|
|00001d40| 29 0a 23 40 31 35 32 20 | 46 75 6e 63 74 69 6f 6e |).#@152 |Function|
|00001d50| 20 74 6f 20 62 65 20 63 | 61 6c 6c 65 64 20 61 66 | to be c|alled af|
|00001d60| 74 65 72 20 60 65 6d 65 | 72 67 65 2d 7b 62 65 66 |ter `eme|rge-{bef|
|00001d70| 6f 72 65 2c 61 66 74 65 | 72 7d 2d 66 6c 61 67 27 |ore,afte|r}-flag'|
|00001d80| 2e 0a 54 68 69 73 20 69 | 73 20 63 61 6c 6c 65 64 |..This i|s called|
|00001d90| 20 61 66 74 65 72 20 74 | 68 65 73 65 20 66 75 6e | after t|hese fun|
|00001da0| 63 74 69 6f 6e 73 20 61 | 72 65 20 63 68 61 6e 67 |ctions a|re chang|
|00001db0| 65 64 20 74 6f 20 63 6f | 6d 70 75 74 65 20 76 61 |ed to co|mpute va|
|00001dc0| 6c 75 65 73 20 74 68 61 | 74 0a 64 65 70 65 6e 64 |lues tha|t.depend|
|00001dd0| 20 6f 6e 20 74 68 65 20 | 66 6c 61 67 73 2e 1f 0a | on the |flags...|
|00001de0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00001df0| 65 2d 6e 65 77 2d 66 6c | 61 67 73 20 23 5b 6e 69 |e-new-fl|ags #[ni|
|00001e00| 6c 20 22 08 47 11 c2 08 | c3 5c 22 14 c5 08 21 16 |l ".G...|.\"...!.|
|00001e10| 06 0e 07 47 16 08 c2 0e | 07 c3 5c 22 16 09 c5 0e |...G....|..\"....|
|00001e20| 07 21 89 16 5c 6e 87 22 | 20 5b 65 6d 65 72 67 65 |.!..\n."| [emerge|
|00001e30| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 20 65 6d 65 |-before-|flag eme|
|00001e40| 72 67 65 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2d |rge-befo|re-flag-|
|00001e50| 6c 65 6e 67 74 68 20 65 | 6d 65 72 67 65 2d 63 6f |length e|merge-co|
|00001e60| 75 6e 74 2d 6d 61 74 63 | 68 65 73 2d 73 74 72 69 |unt-matc|hes-stri|
|00001e70| 6e 67 20 22 5c 6e 22 20 | 65 6d 65 72 67 65 2d 62 |ng "\n" |emerge-b|
|00001e80| 65 66 6f 72 65 2d 66 6c | 61 67 2d 6c 69 6e 65 73 |efore-fl|ag-lines|
|00001e90| 20 72 65 67 65 78 70 2d | 71 75 6f 74 65 20 65 6d | regexp-|quote em|
|00001ea0| 65 72 67 65 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |erge-bef|ore-flag|
|00001eb0| 2d 6d 61 74 63 68 20 65 | 6d 65 72 67 65 2d 61 66 |-match e|merge-af|
|00001ec0| 74 65 72 2d 66 6c 61 67 | 20 65 6d 65 72 67 65 2d |ter-flag| emerge-|
|00001ed0| 61 66 74 65 72 2d 66 6c | 61 67 2d 6c 65 6e 67 74 |after-fl|ag-lengt|
|00001ee0| 68 20 65 6d 65 72 67 65 | 2d 61 66 74 65 72 2d 66 |h emerge|-after-f|
|00001ef0| 6c 61 67 2d 6c 69 6e 65 | 73 20 65 6d 65 72 67 65 |lag-line|s emerge|
|00001f00| 2d 61 66 74 65 72 2d 66 | 6c 61 67 2d 6d 61 74 63 |-after-f|lag-matc|
|00001f10| 68 5d 20 33 20 28 23 24 | 20 2e 20 37 34 39 36 29 |h] 3 (#$| . 7496)|
|00001f20| 5d 29 0a 23 40 35 32 20 | 52 65 74 75 72 6e 20 74 |]).#@52 |Return t|
|00001f30| 68 65 20 6e 75 6d 62 65 | 72 20 6f 66 20 6d 61 74 |he numbe|r of mat|
|00001f40| 63 68 65 73 20 69 6e 20 | 53 54 52 49 4e 47 20 66 |ches in |STRING f|
|00001f50| 6f 72 20 52 45 47 45 58 | 50 2e 1f 0a 28 64 65 66 |or REGEX|P...(def|
|00001f60| 61 6c 69 61 73 20 27 65 | 6d 65 72 67 65 2d 63 6f |alias 'e|merge-co|
|00001f70| 75 6e 74 2d 6d 61 74 63 | 68 65 73 2d 73 74 72 69 |unt-matc|hes-stri|
|00001f80| 6e 67 20 23 5b 28 73 74 | 72 69 6e 67 20 72 65 67 |ng #[(st|ring reg|
|00001f90| 65 78 70 29 20 22 c0 89 | 19 1a c3 5c 66 0d 5c 6e |exp) "..|...\f.\n|
|00001fa0| 23 83 15 00 09 54 11 c0 | 95 12 82 04 00 09 2a 87 |#....T..|......*.|
|00001fb0| 22 20 5b 30 20 63 6f 75 | 6e 74 20 69 20 73 74 72 |" [0 cou|nt i str|
|00001fc0| 69 6e 67 2d 6d 61 74 63 | 68 20 72 65 67 65 78 70 |ing-matc|h regexp|
|00001fd0| 20 73 74 72 69 6e 67 5d | 20 34 20 28 23 24 20 2e | string]| 4 (#$ .|
|00001fe0| 20 37 39 37 36 29 5d 29 | 0a 28 65 6d 65 72 67 65 | 7976)])|.(emerge|
|00001ff0| 2d 6e 65 77 2d 66 6c 61 | 67 73 29 0a 23 40 31 30 |-new-fla|gs).#@10|
|00002000| 32 20 2a 4e 75 6d 62 65 | 72 20 6f 66 20 6c 69 6e |2 *Numbe|r of lin|
|00002010| 65 73 20 74 68 61 74 20 | 77 65 20 77 61 6e 74 20 |es that |we want |
|00002020| 74 6f 20 73 68 6f 77 20 | 61 62 6f 76 65 20 61 6e |to show |above an|
|00002030| 64 20 62 65 6c 6f 77 20 | 74 68 65 20 66 6c 61 67 |d below |the flag|
|00002040| 73 20 77 68 65 6e 20 77 | 65 20 61 72 65 0a 64 69 |s when w|e are.di|
|00002050| 73 70 6c 61 79 69 6e 67 | 20 61 20 64 69 66 66 65 |splaying| a diffe|
|00002060| 72 65 6e 63 65 2e 1f 0a | 28 64 65 66 76 61 72 20 |rence...|(defvar |
|00002070| 65 6d 65 72 67 65 2d 6d | 69 6e 2d 76 69 73 69 62 |emerge-m|in-visib|
|00002080| 6c 65 2d 6c 69 6e 65 73 | 20 33 20 28 23 24 20 2e |le-lines| 3 (#$ .|
|00002090| 20 2d 38 31 39 34 29 29 | 0a 23 40 38 39 20 2a 50 | -8194))|.#@89 *P|
|000020a0| 72 65 66 69 78 20 74 6f | 20 70 75 74 20 6f 6e 20 |refix to| put on |
|000020b0| 45 6d 65 72 67 65 20 74 | 65 6d 70 6f 72 61 72 79 |Emerge t|emporary|
|000020c0| 20 66 69 6c 65 20 6e 61 | 6d 65 73 2e 0a 44 6f 20 | file na|mes..Do |
|000020d0| 6e 6f 74 20 73 74 61 72 | 74 20 77 69 74 68 20 60 |not star|t with `|
|000020e0| 7e 2f 27 20 6f 72 20 60 | 7e 75 73 65 72 2d 6e 61 |~/' or `|~user-na|
|000020f0| 6d 65 2f 27 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |me/'...(|defvar e|
|00002100| 6d 65 72 67 65 2d 74 65 | 6d 70 2d 66 69 6c 65 2d |merge-te|mp-file-|
|00002110| 70 72 65 66 69 78 20 28 | 62 79 74 65 2d 63 6f 64 |prefix (|byte-cod|
|00002120| 65 20 22 c0 c1 21 86 0f | 00 c0 c2 21 86 0f 00 c0 |e "..!..|...!....|
|00002130| c3 21 c4 1d 89 1e 06 83 | 24 00 0e 06 47 c7 56 83 |.!......|$...G.V.|
|00002140| 24 00 0e 06 82 25 00 c8 | 89 15 89 47 53 48 c9 55 |$....%..|...GSH.U|
|00002150| 83 35 00 0d c7 ca 4f 15 | 0d cb 50 2a 87 22 20 5b |.5....O.|..P*." [|
|00002160| 67 65 74 65 6e 76 20 22 | 54 4d 50 44 49 52 22 20 |getenv "|TMPDIR" |
|00002170| 22 54 4d 50 22 20 22 54 | 45 4d 50 22 20 6e 69 6c |"TMP" "T|EMP" nil|
|00002180| 20 64 20 65 6e 76 20 30 | 20 22 2f 74 6d 70 22 20 | d env 0| "/tmp" |
|00002190| 34 37 20 2d 31 20 22 2f | 65 6d 65 72 67 65 22 5d |47 -1 "/|emerge"]|
|000021a0| 20 34 29 20 28 23 24 20 | 2e 20 2d 38 33 35 30 29 | 4) (#$ |. -8350)|
|000021b0| 29 0a 23 40 33 35 20 2a | 4d 6f 64 65 20 66 6f 72 |).#@35 *|Mode for|
|000021c0| 20 45 6d 65 72 67 65 20 | 74 65 6d 70 6f 72 61 72 | Emerge |temporar|
|000021d0| 79 20 66 69 6c 65 73 2e | 1f 0a 28 64 65 66 76 61 |y files.|..(defva|
|000021e0| 72 20 65 6d 65 72 67 65 | 2d 74 65 6d 70 2d 66 69 |r emerge|-temp-fi|
|000021f0| 6c 65 2d 6d 6f 64 65 20 | 33 38 34 20 28 23 24 20 |le-mode |384 (#$ |
|00002200| 2e 20 2d 38 36 33 31 29 | 29 0a 23 40 34 32 38 20 |. -8631)|).#@428 |
|00002210| 2a 54 65 6d 70 6c 61 74 | 65 20 66 6f 72 20 60 65 |*Templat|e for `e|
|00002220| 6d 65 72 67 65 2d 63 6f | 6d 62 69 6e 65 2d 76 65 |merge-co|mbine-ve|
|00002230| 72 73 69 6f 6e 73 27 20 | 74 6f 20 63 6f 6d 62 69 |rsions' |to combi|
|00002240| 6e 65 20 74 68 65 20 74 | 77 6f 20 76 65 72 73 69 |ne the t|wo versi|
|00002250| 6f 6e 73 2e 0a 54 68 65 | 20 74 65 6d 70 6c 61 74 |ons..The| templat|
|00002260| 65 20 69 73 20 69 6e 73 | 65 72 74 65 64 20 61 73 |e is ins|erted as|
|00002270| 20 61 20 73 74 72 69 6e | 67 2c 20 77 69 74 68 20 | a strin|g, with |
|00002280| 74 68 65 20 66 6f 6c 6c | 6f 77 69 6e 67 20 69 6e |the foll|owing in|
|00002290| 74 65 72 70 6f 6c 61 74 | 69 6f 6e 73 3a 0a 09 25 |terpolat|ions:..%|
|000022a0| 61 09 74 68 65 20 41 20 | 76 65 72 73 69 6f 6e 20 |a.the A |version |
|000022b0| 6f 66 20 74 68 65 20 64 | 69 66 66 65 72 65 6e 63 |of the d|ifferenc|
|000022c0| 65 0a 09 25 62 09 74 68 | 65 20 42 20 76 65 72 73 |e..%b.th|e B vers|
|000022d0| 69 6f 6e 20 6f 66 20 74 | 68 65 20 64 69 66 66 65 |ion of t|he diffe|
|000022e0| 72 65 6e 63 65 0a 09 25 | 25 09 74 68 65 20 63 68 |rence..%|%.the ch|
|000022f0| 61 72 61 63 74 65 72 20 | 60 25 27 0a 44 6f 6e 27 |aracter |`%'.Don'|
|00002300| 74 20 66 6f 72 67 65 74 | 20 74 6f 20 65 6e 64 20 |t forget| to end |
|00002310| 74 68 65 20 74 65 6d 70 | 6c 61 74 65 20 77 69 74 |the temp|late wit|
|00002320| 68 20 61 20 6e 65 77 6c | 69 6e 65 2e 0a 4e 6f 74 |h a newl|ine..Not|
|00002330| 65 20 74 68 61 74 20 74 | 68 69 73 20 76 61 72 69 |e that t|his vari|
|00002340| 61 62 6c 65 20 63 61 6e | 20 62 65 20 6d 61 64 65 |able can| be made|
|00002350| 20 6c 6f 63 61 6c 20 74 | 6f 20 61 20 70 61 72 74 | local t|o a part|
|00002360| 69 63 75 6c 61 72 20 6d | 65 72 67 65 20 62 75 66 |icular m|erge buf|
|00002370| 66 65 72 20 62 79 0a 67 | 69 76 69 6e 67 20 61 20 |fer by.g|iving a |
|00002380| 70 72 65 66 69 78 20 61 | 72 67 75 6d 65 6e 74 20 |prefix a|rgument |
|00002390| 74 6f 20 60 65 6d 65 72 | 67 65 2d 73 65 74 2d 63 |to `emer|ge-set-c|
|000023a0| 6f 6d 62 69 6e 65 2d 76 | 65 72 73 69 6f 6e 73 2d |ombine-v|ersions-|
|000023b0| 74 65 6d 70 6c 61 74 65 | 27 2e 1f 0a 28 64 65 66 |template|'...(def|
|000023c0| 76 61 72 20 65 6d 65 72 | 67 65 2d 63 6f 6d 62 69 |var emer|ge-combi|
|000023d0| 6e 65 2d 76 65 72 73 69 | 6f 6e 73 2d 74 65 6d 70 |ne-versi|ons-temp|
|000023e0| 6c 61 74 65 20 22 23 69 | 66 64 65 66 20 4e 45 57 |late "#i|fdef NEW|
|000023f0| 5c 6e 25 62 23 65 6c 73 | 65 20 2f 2a 20 6e 6f 74 |\n%b#els|e /* not|
|00002400| 20 4e 45 57 20 2a 2f 5c | 6e 25 61 23 65 6e 64 69 | NEW */\|n%a#endi|
|00002410| 66 20 2f 2a 20 6e 6f 74 | 20 4e 45 57 20 2a 2f 5c |f /* not| NEW */\|
|00002420| 6e 22 20 28 23 24 20 2e | 20 2d 38 37 32 30 29 29 |n" (#$ .| -8720))|
|00002430| 0a 23 40 31 34 33 20 4b | 65 79 6d 61 70 20 6f 66 |.#@143 K|eymap of|
|00002440| 20 45 6d 65 72 67 65 20 | 63 6f 6d 6d 61 6e 64 73 | Emerge |commands|
|00002450| 2e 0a 44 69 72 65 63 74 | 6c 79 20 61 76 61 69 6c |..Direct|ly avail|
|00002460| 61 62 6c 65 20 69 6e 20 | 60 66 61 73 74 27 20 6d |able in |`fast' m|
|00002470| 6f 64 65 3b 0a 6d 75 73 | 74 20 62 65 20 70 72 65 |ode;.mus|t be pre|
|00002480| 66 69 78 65 64 20 62 79 | 20 5c 3c 65 6d 65 72 67 |fixed by| \<emerg|
|00002490| 65 2d 66 61 73 74 2d 6b | 65 79 6d 61 70 3e 5c 5b |e-fast-k|eymap>\[|
|000024a0| 65 6d 65 72 67 65 2d 62 | 61 73 69 63 2d 6b 65 79 |emerge-b|asic-key|
|000024b0| 6d 61 70 5d 20 69 6e 20 | 60 65 64 69 74 27 20 6d |map] in |`edit' m|
|000024c0| 6f 64 65 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |ode...(d|efvar em|
|000024d0| 65 72 67 65 2d 62 61 73 | 69 63 2d 6b 65 79 6d 61 |erge-bas|ic-keyma|
|000024e0| 70 20 6e 69 6c 20 28 23 | 24 20 2e 20 39 32 37 31 |p nil (#|$ . 9271|
|000024f0| 29 29 0a 23 40 38 34 20 | 4c 6f 63 61 6c 20 6b 65 |)).#@84 |Local ke|
|00002500| 79 6d 61 70 20 75 73 65 | 64 20 69 6e 20 45 6d 65 |ymap use|d in Eme|
|00002510| 72 67 65 20 60 66 61 73 | 74 27 20 6d 6f 64 65 2e |rge `fas|t' mode.|
|00002520| 0a 4d 61 6b 65 73 20 45 | 6d 65 72 67 65 20 63 6f |.Makes E|merge co|
|00002530| 6d 6d 61 6e 64 73 20 64 | 69 72 65 63 74 6c 79 20 |mmands d|irectly |
|00002540| 61 76 61 69 6c 61 62 6c | 65 2e 1f 0a 28 64 65 66 |availabl|e...(def|
|00002550| 76 61 72 20 65 6d 65 72 | 67 65 2d 66 61 73 74 2d |var emer|ge-fast-|
|00002560| 6b 65 79 6d 61 70 20 6e | 69 6c 20 28 23 24 20 2e |keymap n|il (#$ .|
|00002570| 20 39 34 36 34 29 29 0a | 28 62 79 74 65 2d 63 6f | 9464)).|(byte-co|
|00002580| 64 65 20 22 c0 c1 21 84 | 5c 6e 00 c2 c3 21 11 c1 |de "..!.|\n...!..|
|00002590| 5c 66 42 14 c0 c5 21 84 | 18 00 c2 c6 21 15 c5 5c |\fB...!.|....!..\|
|000025a0| 66 42 14 c0 c7 21 84 27 | 00 c2 c8 21 16 07 c7 5c |fB...!.'|...!...\|
|000025b0| 66 42 14 c0 87 22 20 5b | 62 6f 75 6e 64 70 20 65 |fB..." [|boundp e|
|000025c0| 6d 65 72 67 65 2d 6f 70 | 74 69 6f 6e 73 2d 6d 65 |merge-op|tions-me|
|000025d0| 6e 75 20 6d 61 6b 65 2d | 73 70 61 72 73 65 2d 6b |nu make-|sparse-k|
|000025e0| 65 79 6d 61 70 20 22 4f | 70 74 69 6f 6e 73 22 20 |eymap "O|ptions" |
|000025f0| 63 75 72 72 65 6e 74 2d | 6c 6f 61 64 2d 6c 69 73 |current-|load-lis|
|00002600| 74 20 65 6d 65 72 67 65 | 2d 6d 65 72 67 65 2d 6d |t emerge|-merge-m|
|00002610| 65 6e 75 20 22 4d 65 72 | 67 65 22 20 65 6d 65 72 |enu "Mer|ge" emer|
|00002620| 67 65 2d 6d 6f 76 65 2d | 6d 65 6e 75 20 22 4d 6f |ge-move-|menu "Mo|
|00002630| 76 65 22 5d 20 32 29 0a | 23 40 39 30 20 2a 43 6f |ve"] 2).|#@90 *Co|
|00002640| 6d 6d 61 6e 64 20 70 72 | 65 66 69 78 20 66 6f 72 |mmand pr|efix for|
|00002650| 20 45 6d 65 72 67 65 20 | 63 6f 6d 6d 61 6e 64 73 | Emerge |commands|
|00002660| 20 69 6e 20 60 65 64 69 | 74 27 20 6d 6f 64 65 2e | in `edi|t' mode.|
|00002670| 0a 4d 75 73 74 20 62 65 | 20 73 65 74 20 62 65 66 |.Must be| set bef|
|00002680| 6f 72 65 20 45 6d 65 72 | 67 65 20 69 73 20 6c 6f |ore Emer|ge is lo|
|00002690| 61 64 65 64 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |aded...(|defvar e|
|000026a0| 6d 65 72 67 65 2d 63 6f | 6d 6d 61 6e 64 2d 70 72 |merge-co|mmand-pr|
|000026b0| 65 66 69 78 20 22 03 03 | 22 20 28 23 24 20 2e 20 |efix "..|" (#$ . |
|000026c0| 2d 39 37 38 39 29 29 0a | 28 64 65 66 61 6c 69 61 |-9789)).|(defalia|
|000026d0| 73 20 27 65 6d 65 72 67 | 65 2d 73 65 74 75 70 2d |s 'emerg|e-setup-|
|000026e0| 66 69 78 65 64 2d 6b 65 | 79 6d 61 70 73 20 23 5b |fixed-ke|ymaps #[|
|000026f0| 6e 69 6c 20 22 c0 20 11 | c2 09 21 88 c3 09 c4 c5 |nil ". .|..!.....|
|00002700| 23 88 c3 09 c6 c7 23 88 | c3 09 c8 c9 23 88 c3 09 |#.....#.|....#...|
|00002710| ca cb 23 88 c3 09 cc cd | 23 88 c3 09 ce cf 23 88 |..#.....|#.....#.|
|00002720| c3 09 d0 d1 23 88 c3 09 | d2 d3 23 88 c3 09 d4 d5 |....#...|..#.....|
|00002730| 23 88 c3 09 d6 d7 23 88 | c3 09 d8 d9 23 88 c3 09 |#.....#.|....#...|
|00002740| da db 23 88 c3 09 dc dd | 23 88 c3 09 de df 23 88 |..#.....|#.....#.|
|00002750| c3 09 e0 d9 23 88 c3 09 | e1 e2 23 88 c3 09 e3 e4 |....#...|..#.....|
|00002760| 23 88 c3 09 e5 d9 23 88 | c3 09 e6 e7 23 88 c3 09 |#.....#.|....#...|
|00002770| e8 e9 23 88 c3 09 ea d9 | 23 88 c3 09 eb ec 23 88 |..#.....|#.....#.|
|00002780| c3 09 ed ee 23 88 c3 09 | ef f0 23 88 c3 09 f1 f2 |....#...|..#.....|
|00002790| 23 88 c3 09 f3 f4 23 88 | c3 09 f5 f6 23 88 c3 09 |#.....#.|....#...|
|000027a0| f7 f8 23 88 c3 09 f9 fa | 23 88 c3 09 fb d9 23 88 |..#.....|#.....#.|
|000027b0| c3 09 fc fd 23 88 c3 09 | fe ff 23 88 c3 09 81 40 |....#...|..#....@|
|000027c0| 00 81 41 00 23 88 c3 09 | 81 42 00 81 43 00 23 88 |..A.#...|.B..C.#.|
|000027d0| c3 09 81 44 00 81 45 00 | 23 88 c3 09 81 46 00 81 |...D..E.|#....F..|
|000027e0| 47 00 23 88 c3 09 81 48 | 00 81 49 00 23 88 c3 09 |G.#....H|..I.#...|
|000027f0| 81 4a 00 81 4b 00 23 88 | c3 09 81 4c 00 81 4d 00 |.J..K.#.|...L..M.|
|00002800| 23 88 c3 09 81 4e 00 81 | 4f 00 23 88 c1 09 4d 88 |#....N..|O.#...M.|
|00002810| 81 50 00 09 21 16 51 c3 | 0e 51 0e 52 c1 23 88 81 |.P..!.Q.|.Q.R.#..|
|00002820| 51 00 0e 51 4d 88 81 53 | 00 81 54 00 81 55 00 0e |Q..QM..S|..T..U..|
|00002830| 51 81 56 00 20 24 88 81 | 53 00 81 57 00 81 58 00 |Q.V. $..|S..W..X.|
|00002840| 0e 51 81 56 00 20 24 88 | c3 09 81 59 00 81 5a 00 |.Q.V. $.|...Y..Z.|
|00002850| 20 23 88 c3 0e 51 81 5b | 00 81 5c 5c 00 0e 5d 42 | #...Q.[|..\\..]B|
|00002860| 23 88 c3 0e 51 81 5e 00 | 81 5f 00 0e 60 42 23 88 |#...Q.^.|._..`B#.|
|00002870| c3 0e 51 81 61 00 81 62 | 00 0e 63 42 23 88 c3 0e |..Q.a..b|..cB#...|
|00002880| 63 81 64 00 81 65 00 23 | 88 c3 0e 63 81 66 00 81 |c.d..e.#|...c.f..|
|00002890| 67 00 23 88 c3 0e 63 81 | 68 00 81 69 00 23 88 c3 |g.#...c.|h..i.#..|
|000028a0| 0e 63 81 6a 00 81 6b 00 | 23 88 c3 0e 63 81 6c 00 |.c.j..k.|#...c.l.|
|000028b0| 81 6d 00 23 88 c3 0e 63 | 81 6e 00 81 6f 00 23 88 |.m.#...c|.n..o.#.|
|000028c0| c3 0e 63 81 70 00 81 71 | 00 23 88 c3 0e 63 81 72 |..c.p..q|.#...c.r|
|000028d0| 00 81 73 00 23 88 c3 0e | 63 81 74 00 81 75 00 23 |..s.#...|c.t..u.#|
|000028e0| 88 c3 0e 63 81 76 00 81 | 77 00 23 88 c3 0e 63 81 |...c.v..|w.#...c.|
|000028f0| 78 00 81 79 00 23 88 c3 | 0e 5d 81 7a 00 81 7b 00 |x..y.#..|.].z..{.|
|00002900| 23 88 c3 0e 5d 81 7c 00 | 81 7d 00 23 88 c3 0e 5d |#...].|.|.}.#...]|
|00002910| 81 7e 00 81 7f 00 23 88 | c3 0e 5d 81 80 00 81 81 |.~....#.|..].....|
|00002920| 00 23 88 c3 0e 5d 81 82 | 00 81 83 00 23 88 c3 0e |.#...]..|....#...|
|00002930| 5d 81 84 00 81 85 00 23 | 88 c3 0e 5d 81 86 00 81 |]......#|...]....|
|00002940| 87 00 23 88 c3 0e 5d 81 | 88 00 81 89 00 23 88 c3 |..#...].|.....#..|
|00002950| 0e 5d 81 8a 00 81 8b 00 | 23 88 c3 0e 60 81 8c 00 |.]......|#...`...|
|00002960| 81 8d 00 23 88 c3 0e 60 | 81 8e 00 81 8f 00 23 88 |...#...`|......#.|
|00002970| c3 0e 60 81 90 00 81 91 | 00 23 88 c3 0e 60 81 92 |..`.....|.#...`..|
|00002980| 00 81 93 00 23 88 c3 0e | 60 81 94 00 81 95 00 23 |....#...|`......#|
|00002990| 88 c3 0e 60 81 96 00 81 | 97 00 23 88 c3 0e 60 81 |...`....|..#...`.|
|000029a0| 98 00 81 99 00 23 88 c3 | 0e 60 81 9a 00 81 9b 00 |.....#..|.`......|
|000029b0| 23 88 c3 0e 60 81 9c 00 | 81 9d 00 23 88 c3 0e 60 |#...`...|...#...`|
|000029c0| 81 9e 00 81 9f 00 23 88 | c3 0e 60 81 a0 00 81 a1 |......#.|..`.....|
|000029d0| 00 23 88 c3 0e 60 81 a2 | 00 81 a3 00 23 87 22 20 |.#...`..|....#." |
|000029e0| 5b 6d 61 6b 65 2d 6b 65 | 79 6d 61 70 20 65 6d 65 |[make-ke|ymap eme|
|000029f0| 72 67 65 2d 62 61 73 69 | 63 2d 6b 65 79 6d 61 70 |rge-basi|c-keymap|
|00002a00| 20 73 75 70 70 72 65 73 | 73 2d 6b 65 79 6d 61 70 | suppres|s-keymap|
|00002a10| 20 64 65 66 69 6e 65 2d | 6b 65 79 20 22 70 22 20 | define-|key "p" |
|00002a20| 65 6d 65 72 67 65 2d 70 | 72 65 76 69 6f 75 73 2d |emerge-p|revious-|
|00002a30| 64 69 66 66 65 72 65 6e | 63 65 20 22 6e 22 20 65 |differen|ce "n" e|
|00002a40| 6d 65 72 67 65 2d 6e 65 | 78 74 2d 64 69 66 66 65 |merge-ne|xt-diffe|
|00002a50| 72 65 6e 63 65 20 22 61 | 22 20 65 6d 65 72 67 65 |rence "a|" emerge|
|00002a60| 2d 73 65 6c 65 63 74 2d | 41 20 22 62 22 20 65 6d |-select-|A "b" em|
|00002a70| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 42 20 22 6a |erge-sel|ect-B "j|
|00002a80| 22 20 65 6d 65 72 67 65 | 2d 6a 75 6d 70 2d 74 6f |" emerge|-jump-to|
|00002a90| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 22 2e 22 20 |-differe|nce "." |
|00002aa0| 65 6d 65 72 67 65 2d 66 | 69 6e 64 2d 64 69 66 66 |emerge-f|ind-diff|
|00002ab0| 65 72 65 6e 63 65 20 22 | 71 22 20 65 6d 65 72 67 |erence "|q" emerg|
|00002ac0| 65 2d 71 75 69 74 20 22 | 1d 22 20 65 6d 65 72 67 |e-quit "|." emerg|
|00002ad0| 65 2d 61 62 6f 72 74 20 | 22 66 22 20 65 6d 65 72 |e-abort |"f" emer|
|00002ae0| 67 65 2d 66 61 73 74 2d | 6d 6f 64 65 20 22 65 22 |ge-fast-|mode "e"|
|00002af0| 20 65 6d 65 72 67 65 2d | 65 64 69 74 2d 6d 6f 64 | emerge-|edit-mod|
|00002b00| 65 20 22 73 22 20 6e 69 | 6c 20 22 73 61 22 20 65 |e "s" ni|l "sa" e|
|00002b10| 6d 65 72 67 65 2d 61 75 | 74 6f 2d 61 64 76 61 6e |merge-au|to-advan|
|00002b20| 63 65 20 22 73 73 22 20 | 65 6d 65 72 67 65 2d 73 |ce "ss" |emerge-s|
|00002b30| 6b 69 70 2d 70 72 65 66 | 65 72 73 20 22 6c 22 20 |kip-pref|ers "l" |
|00002b40| 65 6d 65 72 67 65 2d 72 | 65 63 65 6e 74 65 72 20 |emerge-r|ecenter |
|00002b50| 22 64 22 20 22 64 61 22 | 20 65 6d 65 72 67 65 2d |"d" "da"| emerge-|
|00002b60| 64 65 66 61 75 6c 74 2d | 41 20 22 64 62 22 20 65 |default-|A "db" e|
|00002b70| 6d 65 72 67 65 2d 64 65 | 66 61 75 6c 74 2d 42 20 |merge-de|fault-B |
|00002b80| 22 63 22 20 22 63 61 22 | 20 65 6d 65 72 67 65 2d |"c" "ca"| emerge-|
|00002b90| 63 6f 70 79 2d 61 73 2d | 6b 69 6c 6c 2d 41 20 22 |copy-as-|kill-A "|
|00002ba0| 63 62 22 20 65 6d 65 72 | 67 65 2d 63 6f 70 79 2d |cb" emer|ge-copy-|
|00002bb0| 61 73 2d 6b 69 6c 6c 2d | 42 20 22 69 22 20 22 69 |as-kill-|B "i" "i|
|00002bc0| 61 22 20 65 6d 65 72 67 | 65 2d 69 6e 73 65 72 74 |a" emerg|e-insert|
|00002bd0| 2d 41 20 22 69 62 22 20 | 65 6d 65 72 67 65 2d 69 |-A "ib" |emerge-i|
|00002be0| 6e 73 65 72 74 2d 42 20 | 22 6d 22 20 65 6d 65 72 |nsert-B |"m" emer|
|00002bf0| 67 65 2d 6d 61 72 6b 2d | 64 69 66 66 65 72 65 6e |ge-mark-|differen|
|00002c00| 63 65 20 22 76 22 20 65 | 6d 65 72 67 65 2d 73 63 |ce "v" e|merge-sc|
|00002c10| 72 6f 6c 6c 2d 75 70 20 | 22 5e 22 20 65 6d 65 72 |roll-up |"^" emer|
|00002c20| 67 65 2d 73 63 72 6f 6c | 6c 2d 64 6f 77 6e 20 22 |ge-scrol|l-down "|
|00002c30| 3c 22 20 65 6d 65 72 67 | 65 2d 73 63 72 6f 6c 6c |<" emerg|e-scroll|
|00002c40| 2d 6c 65 66 74 20 22 3e | 22 20 65 6d 65 72 67 65 |-left ">|" emerge|
|00002c50| 2d 73 63 72 6f 6c 6c 2d | 72 69 67 68 74 20 22 7c |-scroll-|right "||
|00002c60| 22 20 65 6d 65 72 67 65 | 2d 73 63 72 6f 6c 6c 2d |" emerge|-scroll-|
|00002c70| 72 65 73 65 74 20 22 78 | 22 20 22 78 31 22 20 65 |reset "x|" "x1" e|
|00002c80| 6d 65 72 67 65 2d 6f 6e | 65 2d 6c 69 6e 65 2d 77 |merge-on|e-line-w|
|00002c90| 69 6e 64 6f 77 20 22 78 | 63 22 20 65 6d 65 72 67 |indow "x|c" emerg|
|00002ca0| 65 2d 63 6f 6d 62 69 6e | 65 2d 76 65 72 73 69 6f |e-combin|e-versio|
|00002cb0| 6e 73 20 22 78 43 22 20 | 65 6d 65 72 67 65 2d 63 |ns "xC" |emerge-c|
|00002cc0| 6f 6d 62 69 6e 65 2d 76 | 65 72 73 69 6f 6e 73 2d |ombine-v|ersions-|
|00002cd0| 72 65 67 69 73 74 65 72 | 20 22 78 66 22 20 65 6d |register| "xf" em|
|00002ce0| 65 72 67 65 2d 66 69 6c | 65 2d 6e 61 6d 65 73 20 |erge-fil|e-names |
|00002cf0| 22 78 6a 22 20 65 6d 65 | 72 67 65 2d 6a 6f 69 6e |"xj" eme|rge-join|
|00002d00| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 22 78 6c |-differe|nces "xl|
|00002d10| 22 20 65 6d 65 72 67 65 | 2d 6c 69 6e 65 2d 6e 75 |" emerge|-line-nu|
|00002d20| 6d 62 65 72 73 20 22 78 | 6d 22 20 65 6d 65 72 67 |mbers "x|m" emerg|
|00002d30| 65 2d 73 65 74 2d 6d 65 | 72 67 65 2d 6d 6f 64 65 |e-set-me|rge-mode|
|00002d40| 20 22 78 73 22 20 65 6d | 65 72 67 65 2d 73 70 6c | "xs" em|erge-spl|
|00002d50| 69 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 22 78 |it-diffe|rence "x|
|00002d60| 74 22 20 65 6d 65 72 67 | 65 2d 74 72 69 6d 2d 64 |t" emerg|e-trim-d|
|00002d70| 69 66 66 65 72 65 6e 63 | 65 20 22 78 78 22 20 65 |ifferenc|e "xx" e|
|00002d80| 6d 65 72 67 65 2d 73 65 | 74 2d 63 6f 6d 62 69 6e |merge-se|t-combin|
|00002d90| 65 2d 76 65 72 73 69 6f | 6e 73 2d 74 65 6d 70 6c |e-versio|ns-templ|
|00002da0| 61 74 65 20 63 6f 70 79 | 2d 6b 65 79 6d 61 70 20 |ate copy|-keymap |
|00002db0| 65 6d 65 72 67 65 2d 66 | 61 73 74 2d 6b 65 79 6d |emerge-f|ast-keym|
|00002dc0| 61 70 20 65 6d 65 72 67 | 65 2d 63 6f 6d 6d 61 6e |ap emerg|e-comman|
|00002dd0| 64 2d 70 72 65 66 69 78 | 20 73 75 62 73 74 69 74 |d-prefix| substit|
|00002de0| 75 74 65 2d 6b 65 79 2d | 64 65 66 69 6e 69 74 69 |ute-key-|definiti|
|00002df0| 6f 6e 20 77 72 69 74 65 | 2d 66 69 6c 65 20 65 6d |on write|-file em|
|00002e00| 65 72 67 65 2d 71 75 65 | 72 79 2d 77 72 69 74 65 |erge-que|ry-write|
|00002e10| 2d 66 69 6c 65 20 63 75 | 72 72 65 6e 74 2d 67 6c |-file cu|rrent-gl|
|00002e20| 6f 62 61 6c 2d 6d 61 70 | 20 73 61 76 65 2d 62 75 |obal-map| save-bu|
|00002e30| 66 66 65 72 20 65 6d 65 | 72 67 65 2d 71 75 65 72 |ffer eme|rge-quer|
|00002e40| 79 2d 73 61 76 65 2d 62 | 75 66 66 65 72 20 5b 6d |y-save-b|uffer [m|
|00002e50| 65 6e 75 2d 62 61 72 5d | 20 6d 61 6b 65 2d 73 70 |enu-bar]| make-sp|
|00002e60| 61 72 73 65 2d 6b 65 79 | 6d 61 70 20 5b 6d 65 6e |arse-key|map [men|
|00002e70| 75 2d 62 61 72 20 6f 70 | 74 69 6f 6e 73 5d 20 22 |u-bar op|tions] "|
|00002e80| 4f 70 74 69 6f 6e 73 22 | 20 65 6d 65 72 67 65 2d |Options"| emerge-|
|00002e90| 6f 70 74 69 6f 6e 73 2d | 6d 65 6e 75 20 5b 6d 65 |options-|menu [me|
|00002ea0| 6e 75 2d 62 61 72 20 6d | 65 72 67 65 5d 20 22 4d |nu-bar m|erge] "M|
|00002eb0| 65 72 67 65 22 20 65 6d | 65 72 67 65 2d 6d 65 72 |erge" em|erge-mer|
|00002ec0| 67 65 2d 6d 65 6e 75 20 | 5b 6d 65 6e 75 2d 62 61 |ge-menu |[menu-ba|
|00002ed0| 72 20 6d 6f 76 65 5d 20 | 22 4d 6f 76 65 22 20 65 |r move] |"Move" e|
|00002ee0| 6d 65 72 67 65 2d 6d 6f | 76 65 2d 6d 65 6e 75 20 |merge-mo|ve-menu |
|00002ef0| 5b 65 6d 65 72 67 65 2d | 73 63 72 6f 6c 6c 2d 72 |[emerge-|scroll-r|
|00002f00| 65 73 65 74 5d 20 28 22 | 53 63 72 6f 6c 6c 20 52 |eset] ("|Scroll R|
|00002f10| 65 73 65 74 22 20 2e 20 | 65 6d 65 72 67 65 2d 73 |eset" . |emerge-s|
|00002f20| 63 72 6f 6c 6c 2d 72 65 | 73 65 74 29 20 5b 65 6d |croll-re|set) [em|
|00002f30| 65 72 67 65 2d 73 63 72 | 6f 6c 6c 2d 72 69 67 68 |erge-scr|oll-righ|
|00002f40| 74 5d 20 28 22 53 63 72 | 6f 6c 6c 20 52 69 67 68 |t] ("Scr|oll Righ|
|00002f50| 74 22 20 2e 20 65 6d 65 | 72 67 65 2d 73 63 72 6f |t" . eme|rge-scro|
|00002f60| 6c 6c 2d 72 69 67 68 74 | 29 20 5b 65 6d 65 72 67 |ll-right|) [emerg|
|00002f70| 65 2d 73 63 72 6f 6c 6c | 2d 6c 65 66 74 5d 20 28 |e-scroll|-left] (|
|00002f80| 22 53 63 72 6f 6c 6c 20 | 4c 65 66 74 22 20 2e 20 |"Scroll |Left" . |
|00002f90| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 6c 65 |emerge-s|croll-le|
|00002fa0| 66 74 29 20 5b 65 6d 65 | 72 67 65 2d 73 63 72 6f |ft) [eme|rge-scro|
|00002fb0| 6c 6c 2d 64 6f 77 6e 5d | 20 28 22 53 63 72 6f 6c |ll-down]| ("Scrol|
|00002fc0| 6c 20 44 6f 77 6e 22 20 | 2e 20 65 6d 65 72 67 65 |l Down" |. emerge|
|00002fd0| 2d 73 63 72 6f 6c 6c 2d | 64 6f 77 6e 29 20 5b 65 |-scroll-|down) [e|
|00002fe0| 6d 65 72 67 65 2d 73 63 | 72 6f 6c 6c 2d 75 70 5d |merge-sc|roll-up]|
|00002ff0| 20 28 22 53 63 72 6f 6c | 6c 20 55 70 22 20 2e 20 | ("Scrol|l Up" . |
|00003000| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 75 70 |emerge-s|croll-up|
|00003010| 29 20 5b 65 6d 65 72 67 | 65 2d 72 65 63 65 6e 74 |) [emerg|e-recent|
|00003020| 65 72 5d 20 28 22 52 65 | 63 65 6e 74 65 72 22 20 |er] ("Re|center" |
|00003030| 2e 20 65 6d 65 72 67 65 | 2d 72 65 63 65 6e 74 65 |. emerge|-recente|
|00003040| 72 29 20 5b 65 6d 65 72 | 67 65 2d 6d 61 72 6b 2d |r) [emer|ge-mark-|
|00003050| 64 69 66 66 65 72 65 6e | 63 65 5d 20 28 22 4d 61 |differen|ce] ("Ma|
|00003060| 72 6b 20 44 69 66 66 65 | 72 65 6e 63 65 22 20 2e |rk Diffe|rence" .|
|00003070| 20 65 6d 65 72 67 65 2d | 6d 61 72 6b 2d 64 69 66 | emerge-|mark-dif|
|00003080| 66 65 72 65 6e 63 65 29 | 20 5b 65 6d 65 72 67 65 |ference)| [emerge|
|00003090| 2d 6a 75 6d 70 2d 74 6f | 2d 64 69 66 66 65 72 65 |-jump-to|-differe|
|000030a0| 6e 63 65 5d 20 28 22 4a | 75 6d 70 20 54 6f 20 44 |nce] ("J|ump To D|
|000030b0| 69 66 66 65 72 65 6e 63 | 65 22 20 2e 20 65 6d 65 |ifferenc|e" . eme|
|000030c0| 72 67 65 2d 6a 75 6d 70 | 2d 74 6f 2d 64 69 66 66 |rge-jump|-to-diff|
|000030d0| 65 72 65 6e 63 65 29 20 | 5b 65 6d 65 72 67 65 2d |erence) |[emerge-|
|000030e0| 66 69 6e 64 2d 64 69 66 | 66 65 72 65 6e 63 65 5d |find-dif|ference]|
|000030f0| 20 28 22 46 69 6e 64 20 | 44 69 66 66 65 72 65 6e | ("Find |Differen|
|00003100| 63 65 22 20 2e 20 65 6d | 65 72 67 65 2d 66 69 6e |ce" . em|erge-fin|
|00003110| 64 2d 64 69 66 66 65 72 | 65 6e 63 65 29 20 5b 65 |d-differ|ence) [e|
|00003120| 6d 65 72 67 65 2d 70 72 | 65 76 69 6f 75 73 2d 64 |merge-pr|evious-d|
|00003130| 69 66 66 65 72 65 6e 63 | 65 5d 20 28 22 50 72 65 |ifferenc|e] ("Pre|
|00003140| 76 69 6f 75 73 20 44 69 | 66 66 65 72 65 6e 63 65 |vious Di|fference|
|00003150| 22 20 2e 20 65 6d 65 72 | 67 65 2d 70 72 65 76 69 |" . emer|ge-previ|
|00003160| 6f 75 73 2d 64 69 66 66 | 65 72 65 6e 63 65 29 20 |ous-diff|erence) |
|00003170| 5b 65 6d 65 72 67 65 2d | 6e 65 78 74 2d 64 69 66 |[emerge-|next-dif|
|00003180| 66 65 72 65 6e 63 65 5d | 20 28 22 4e 65 78 74 20 |ference]| ("Next |
|00003190| 44 69 66 66 65 72 65 6e | 63 65 22 20 2e 20 65 6d |Differen|ce" . em|
|000031a0| 65 72 67 65 2d 6e 65 78 | 74 2d 64 69 66 66 65 72 |erge-nex|t-differ|
|000031b0| 65 6e 63 65 29 20 5b 65 | 6d 65 72 67 65 2d 6f 6e |ence) [e|merge-on|
|000031c0| 65 2d 6c 69 6e 65 2d 77 | 69 6e 64 6f 77 5d 20 28 |e-line-w|indow] (|
|000031d0| 22 4f 6e 65 20 4c 69 6e | 65 20 57 69 6e 64 6f 77 |"One Lin|e Window|
|000031e0| 22 20 2e 20 65 6d 65 72 | 67 65 2d 6f 6e 65 2d 6c |" . emer|ge-one-l|
|000031f0| 69 6e 65 2d 77 69 6e 64 | 6f 77 29 20 5b 65 6d 65 |ine-wind|ow) [eme|
|00003200| 72 67 65 2d 73 65 74 2d | 6d 65 72 67 65 2d 6d 6f |rge-set-|merge-mo|
|00003210| 64 65 5d 20 28 22 53 65 | 74 20 4d 65 72 67 65 20 |de] ("Se|t Merge |
|00003220| 4d 6f 64 65 22 20 2e 20 | 65 6d 65 72 67 65 2d 73 |Mode" . |emerge-s|
|00003230| 65 74 2d 6d 65 72 67 65 | 2d 6d 6f 64 65 29 20 5b |et-merge|-mode) [|
|00003240| 65 6d 65 72 67 65 2d 73 | 65 74 2d 63 6f 6d 62 69 |emerge-s|et-combi|
|00003250| 6e 65 2d 74 65 6d 70 6c | 61 74 65 5d 20 28 22 53 |ne-templ|ate] ("S|
|00003260| 65 74 20 43 6f 6d 62 69 | 6e 65 20 54 65 6d 70 6c |et Combi|ne Templ|
|00003270| 61 74 65 2e 2e 2e 22 20 | 2e 20 65 6d 65 72 67 65 |ate..." |. emerge|
|00003280| 2d 73 65 74 2d 63 6f 6d | 62 69 6e 65 2d 74 65 6d |-set-com|bine-tem|
|00003290| 70 6c 61 74 65 29 20 5b | 65 6d 65 72 67 65 2d 64 |plate) [|emerge-d|
|000032a0| 65 66 61 75 6c 74 2d 42 | 5d 20 28 22 44 65 66 61 |efault-B|] ("Defa|
|000032b0| 75 6c 74 20 42 22 20 2e | 20 65 6d 65 72 67 65 2d |ult B" .| emerge-|
|000032c0| 64 65 66 61 75 6c 74 2d | 42 29 20 5b 65 6d 65 72 |default-|B) [emer|
|000032d0| 67 65 2d 64 65 66 61 75 | 6c 74 2d 41 5d 20 28 22 |ge-defau|lt-A] ("|
|000032e0| 44 65 66 61 75 6c 74 20 | 41 22 20 2e 20 65 6d 65 |Default |A" . eme|
|000032f0| 72 67 65 2d 64 65 66 61 | 75 6c 74 2d 41 29 20 5b |rge-defa|ult-A) [|
|00003300| 65 6d 65 72 67 65 2d 73 | 6b 69 70 2d 70 72 65 66 |emerge-s|kip-pref|
|00003310| 65 72 73 5d 20 28 22 53 | 6b 69 70 20 50 72 65 66 |ers] ("S|kip Pref|
|00003320| 65 72 73 22 20 2e 20 65 | 6d 65 72 67 65 2d 73 6b |ers" . e|merge-sk|
|00003330| 69 70 2d 70 72 65 66 65 | 72 73 29 20 5b 65 6d 65 |ip-prefe|rs) [eme|
|00003340| 72 67 65 2d 61 75 74 6f | 2d 61 64 76 61 6e 63 65 |rge-auto|-advance|
|00003350| 5d 20 28 22 41 75 74 6f | 20 41 64 76 61 6e 63 65 |] ("Auto| Advance|
|00003360| 22 20 2e 20 65 6d 65 72 | 67 65 2d 61 75 74 6f 2d |" . emer|ge-auto-|
|00003370| 61 64 76 61 6e 63 65 29 | 20 5b 65 6d 65 72 67 65 |advance)| [emerge|
|00003380| 2d 65 64 69 74 2d 6d 6f | 64 65 5d 20 28 22 45 64 |-edit-mo|de] ("Ed|
|00003390| 69 74 20 4d 6f 64 65 22 | 20 2e 20 65 6d 65 72 67 |it Mode"| . emerg|
|000033a0| 65 2d 65 64 69 74 2d 6d | 6f 64 65 29 20 5b 65 6d |e-edit-m|ode) [em|
|000033b0| 65 72 67 65 2d 66 61 73 | 74 2d 6d 6f 64 65 5d 20 |erge-fas|t-mode] |
|000033c0| 28 22 46 61 73 74 20 4d | 6f 64 65 22 20 2e 20 65 |("Fast M|ode" . e|
|000033d0| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6d 6f 64 65 29 |merge-fa|st-mode)|
|000033e0| 20 5b 65 6d 65 72 67 65 | 2d 61 62 6f 72 74 5d 20 | [emerge|-abort] |
|000033f0| 28 22 41 62 6f 72 74 22 | 20 2e 20 65 6d 65 72 67 |("Abort"| . emerg|
|00003400| 65 2d 61 62 6f 72 74 29 | 20 5b 65 6d 65 72 67 65 |e-abort)| [emerge|
|00003410| 2d 71 75 69 74 5d 20 28 | 22 51 75 69 74 22 20 2e |-quit] (|"Quit" .|
|00003420| 20 65 6d 65 72 67 65 2d | 71 75 69 74 29 20 5b 65 | emerge-|quit) [e|
|00003430| 6d 65 72 67 65 2d 73 70 | 6c 69 74 2d 64 69 66 66 |merge-sp|lit-diff|
|00003440| 65 72 65 6e 63 65 5d 20 | 28 22 53 70 6c 69 74 20 |erence] |("Split |
|00003450| 44 69 66 66 65 72 65 6e | 63 65 22 20 2e 20 65 6d |Differen|ce" . em|
|00003460| 65 72 67 65 2d 73 70 6c | 69 74 2d 64 69 66 66 65 |erge-spl|it-diffe|
|00003470| 72 65 6e 63 65 29 20 5b | 65 6d 65 72 67 65 2d 6a |rence) [|emerge-j|
|00003480| 6f 69 6e 2d 64 69 66 66 | 65 72 65 6e 63 65 73 5d |oin-diff|erences]|
|00003490| 20 28 22 4a 6f 69 6e 20 | 44 69 66 66 65 72 65 6e | ("Join |Differen|
|000034a0| 63 65 73 22 20 2e 20 65 | 6d 65 72 67 65 2d 6a 6f |ces" . e|merge-jo|
|000034b0| 69 6e 2d 64 69 66 66 65 | 72 65 6e 63 65 73 29 20 |in-diffe|rences) |
|000034c0| 5b 65 6d 65 72 67 65 2d | 74 72 69 6d 2d 64 69 66 |[emerge-|trim-dif|
|000034d0| 66 65 72 65 6e 63 65 5d | 20 28 22 54 72 69 6d 20 |ference]| ("Trim |
|000034e0| 44 69 66 66 65 72 65 6e | 63 65 22 20 2e 20 65 6d |Differen|ce" . em|
|000034f0| 65 72 67 65 2d 74 72 69 | 6d 2d 64 69 66 66 65 72 |erge-tri|m-differ|
|00003500| 65 6e 63 65 29 20 5b 65 | 6d 65 72 67 65 2d 63 6f |ence) [e|merge-co|
|00003510| 6d 62 69 6e 65 2d 76 65 | 72 73 69 6f 6e 73 5d 20 |mbine-ve|rsions] |
|00003520| 28 22 43 6f 6d 62 69 6e | 65 20 56 65 72 73 69 6f |("Combin|e Versio|
|00003530| 6e 73 22 20 2e 20 65 6d | 65 72 67 65 2d 63 6f 6d |ns" . em|erge-com|
|00003540| 62 69 6e 65 2d 76 65 72 | 73 69 6f 6e 73 29 20 5b |bine-ver|sions) [|
|00003550| 65 6d 65 72 67 65 2d 63 | 6f 70 79 2d 61 73 2d 6b |emerge-c|opy-as-k|
|00003560| 69 6c 6c 2d 42 5d 20 28 | 22 43 6f 70 79 20 42 20 |ill-B] (|"Copy B |
|00003570| 61 73 20 4b 69 6c 6c 22 | 20 2e 20 65 6d 65 72 67 |as Kill"| . emerg|
|00003580| 65 2d 63 6f 70 79 2d 61 | 73 2d 6b 69 6c 6c 2d 42 |e-copy-a|s-kill-B|
|00003590| 29 20 5b 65 6d 65 72 67 | 65 2d 63 6f 70 79 2d 61 |) [emerg|e-copy-a|
|000035a0| 73 2d 6b 69 6c 6c 2d 41 | 5d 20 28 22 43 6f 70 79 |s-kill-A|] ("Copy|
|000035b0| 20 41 20 61 73 20 4b 69 | 6c 6c 22 20 2e 20 65 6d | A as Ki|ll" . em|
|000035c0| 65 72 67 65 2d 63 6f 70 | 79 2d 61 73 2d 6b 69 6c |erge-cop|y-as-kil|
|000035d0| 6c 2d 41 29 20 5b 65 6d | 65 72 67 65 2d 69 6e 73 |l-A) [em|erge-ins|
|000035e0| 65 72 74 2d 42 5d 20 28 | 22 49 6e 73 65 72 74 20 |ert-B] (|"Insert |
|000035f0| 42 22 20 2e 20 65 6d 65 | 72 67 65 2d 69 6e 73 65 |B" . eme|rge-inse|
|00003600| 72 74 2d 42 29 20 5b 65 | 6d 65 72 67 65 2d 69 6e |rt-B) [e|merge-in|
|00003610| 73 65 72 74 2d 41 5d 20 | 28 22 49 6e 73 65 72 74 |sert-A] |("Insert|
|00003620| 20 41 22 20 2e 20 65 6d | 65 72 67 65 2d 69 6e 73 | A" . em|erge-ins|
|00003630| 65 72 74 2d 41 29 20 5b | 65 6d 65 72 67 65 2d 73 |ert-A) [|emerge-s|
|00003640| 65 6c 65 63 74 2d 42 5d | 20 28 22 53 65 6c 65 63 |elect-B]| ("Selec|
|00003650| 74 20 42 22 20 2e 20 65 | 6d 65 72 67 65 2d 73 65 |t B" . e|merge-se|
|00003660| 6c 65 63 74 2d 42 29 20 | 5b 65 6d 65 72 67 65 2d |lect-B) |[emerge-|
|00003670| 73 65 6c 65 63 74 2d 41 | 5d 20 28 22 53 65 6c 65 |select-A|] ("Sele|
|00003680| 63 74 20 41 22 20 2e 20 | 65 6d 65 72 67 65 2d 73 |ct A" . |emerge-s|
|00003690| 65 6c 65 63 74 2d 41 29 | 5d 20 35 5d 29 0a 23 40 |elect-A)|] 5]).#@|
|000036a0| 32 38 20 49 6e 64 69 63 | 61 74 6f 72 20 66 6f 72 |28 Indic|ator for|
|000036b0| 20 65 6d 65 72 67 65 2d | 6d 6f 64 65 2e 1f 0a 28 | emerge-|mode...(|
|000036c0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6d 6f |defvar e|merge-mo|
|000036d0| 64 65 20 6e 69 6c 20 28 | 23 24 20 2e 20 31 33 39 |de nil (|#$ . 139|
|000036e0| 38 37 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |87)).(by|te-code |
|000036f0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00003700| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00003710| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00003720| 6d 6f 64 65 20 70 75 74 | 20 70 72 65 73 65 72 76 |mode put| preserv|
|00003730| 65 64 20 74 5d 20 34 29 | 0a 23 40 34 31 20 49 6e |ed t] 4)|.#@41 In|
|00003740| 64 69 63 61 74 6f 72 20 | 66 6f 72 20 65 6d 65 72 |dicator |for emer|
|00003750| 67 65 2d 6d 6f 64 65 20 | 66 61 73 74 20 73 75 62 |ge-mode |fast sub|
|00003760| 6d 6f 64 65 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |mode...(|defvar e|
|00003770| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6d 6f 64 65 20 |merge-fa|st-mode |
|00003780| 6e 69 6c 20 28 23 24 20 | 2e 20 31 34 31 34 32 29 |nil (#$ |. 14142)|
|00003790| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000037a0| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|000037b0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|000037c0| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 66 61 73 |local em|erge-fas|
|000037d0| 74 2d 6d 6f 64 65 20 70 | 75 74 20 70 72 65 73 65 |t-mode p|ut prese|
|000037e0| 72 76 65 64 20 74 5d 20 | 34 29 0a 23 40 34 31 20 |rved t] |4).#@41 |
|000037f0| 49 6e 64 69 63 61 74 6f | 72 20 66 6f 72 20 65 6d |Indicato|r for em|
|00003800| 65 72 67 65 2d 6d 6f 64 | 65 20 65 64 69 74 20 73 |erge-mod|e edit s|
|00003810| 75 62 6d 6f 64 65 2e 1f | 0a 28 64 65 66 76 61 72 |ubmode..|.(defvar|
|00003820| 20 65 6d 65 72 67 65 2d | 65 64 69 74 2d 6d 6f 64 | emerge-|edit-mod|
|00003830| 65 20 6e 69 6c 20 28 23 | 24 20 2e 20 31 34 33 32 |e nil (#|$ . 1432|
|00003840| 30 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |0)).(byt|e-code "|
|00003850| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00003860| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00003870| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 65 |r-local |emerge-e|
|00003880| 64 69 74 2d 6d 6f 64 65 | 20 70 75 74 20 70 72 65 |dit-mode| put pre|
|00003890| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 23 40 34 |served t|] 4).#@4|
|000038a0| 36 20 54 68 65 20 62 75 | 66 66 65 72 20 69 6e 20 |6 The bu|ffer in |
|000038b0| 77 68 69 63 68 20 74 68 | 65 20 41 20 76 61 72 69 |which th|e A vari|
|000038c0| 61 6e 74 20 69 73 20 73 | 74 6f 72 65 64 2e 1f 0a |ant is s|tored...|
|000038d0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 41 |(defvar |emerge-A|
|000038e0| 2d 62 75 66 66 65 72 20 | 6e 69 6c 20 28 23 24 20 |-buffer |nil (#$ |
|000038f0| 2e 20 31 34 34 39 38 29 | 29 0a 28 62 79 74 65 2d |. 14498)|).(byte-|
|00003900| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00003910| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00003920| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 6d |-buffer-|local em|
|00003930| 65 72 67 65 2d 41 2d 62 | 75 66 66 65 72 20 70 75 |erge-A-b|uffer pu|
|00003940| 74 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 34 |t preser|ved t] 4|
|00003950| 29 0a 23 40 34 36 20 54 | 68 65 20 62 75 66 66 65 |).#@46 T|he buffe|
|00003960| 72 20 69 6e 20 77 68 69 | 63 68 20 74 68 65 20 42 |r in whi|ch the B|
|00003970| 20 76 61 72 69 61 6e 74 | 20 69 73 20 73 74 6f 72 | variant| is stor|
|00003980| 65 64 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |ed...(de|fvar eme|
|00003990| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 20 6e 69 6c |rge-B-bu|ffer nil|
|000039a0| 20 28 23 24 20 2e 20 31 | 34 36 37 39 29 29 0a 28 | (#$ . 1|4679)).(|
|000039b0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000039c0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|000039d0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000039e0| 61 6c 20 65 6d 65 72 67 | 65 2d 42 2d 62 75 66 66 |al emerg|e-B-buff|
|000039f0| 65 72 20 70 75 74 20 70 | 72 65 73 65 72 76 65 64 |er put p|reserved|
|00003a00| 20 74 5d 20 34 29 0a 23 | 40 35 33 20 54 68 65 20 | t] 4).#|@53 The |
|00003a10| 62 75 66 66 65 72 20 69 | 6e 20 77 68 69 63 68 20 |buffer i|n which |
|00003a20| 74 68 65 20 6d 65 72 67 | 65 64 20 66 69 6c 65 20 |the merg|ed file |
|00003a30| 69 73 20 6d 61 6e 69 70 | 75 6c 61 74 65 64 2e 1f |is manip|ulated..|
|00003a40| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00003a50| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 20 6e 69 6c |merge-bu|ffer nil|
|00003a60| 20 28 23 24 20 2e 20 31 | 34 38 36 30 29 29 0a 28 | (#$ . 1|4860)).(|
|00003a70| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003a80| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003a90| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003aa0| 61 6c 20 65 6d 65 72 67 | 65 2d 6d 65 72 67 65 2d |al emerg|e-merge-|
|00003ab0| 62 75 66 66 65 72 20 70 | 75 74 20 70 72 65 73 65 |buffer p|ut prese|
|00003ac0| 72 76 65 64 20 74 5d 20 | 34 29 0a 23 40 37 38 20 |rved t] |4).#@78 |
|00003ad0| 54 68 65 20 62 75 66 66 | 65 72 20 69 6e 20 77 68 |The buff|er in wh|
|00003ae0| 69 63 68 20 74 68 65 20 | 61 6e 63 65 73 74 6f 72 |ich the |ancestor|
|00003af0| 20 76 61 72 69 61 6e 74 | 20 69 73 20 73 74 6f 72 | variant| is stor|
|00003b00| 65 64 2c 0a 6f 72 20 6e | 69 6c 20 69 66 20 74 68 |ed,.or n|il if th|
|00003b10| 65 72 65 20 69 73 20 6e | 6f 6e 65 2e 1f 0a 28 64 |ere is n|one...(d|
|00003b20| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 61 6e 63 |efvar em|erge-anc|
|00003b30| 65 73 74 6f 72 2d 62 75 | 66 66 65 72 20 6e 69 6c |estor-bu|ffer nil|
|00003b40| 20 28 23 24 20 2e 20 31 | 35 30 35 36 29 29 0a 28 | (#$ . 1|5056)).(|
|00003b50| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003b60| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003b70| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003b80| 61 6c 20 65 6d 65 72 67 | 65 2d 61 6e 63 65 73 74 |al emerg|e-ancest|
|00003b90| 6f 72 2d 62 75 66 66 65 | 72 20 70 75 74 20 70 72 |or-buffe|r put pr|
|00003ba0| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 23 40 |eserved |t] 4).#@|
|00003bb0| 39 33 20 56 61 72 69 61 | 62 6c 65 73 20 61 6e 64 |93 Varia|bles and|
|00003bc0| 20 70 72 6f 70 65 72 74 | 69 65 73 20 6f 66 20 61 | propert|ies of a|
|00003bd0| 20 62 75 66 66 65 72 20 | 77 68 69 63 68 20 61 72 | buffer |which ar|
|00003be0| 65 20 73 61 76 65 64 2c | 20 6d 6f 64 69 66 69 65 |e saved,| modifie|
|00003bf0| 64 20 61 6e 64 20 72 65 | 73 74 6f 72 65 64 0a 64 |d and re|stored.d|
|00003c00| 75 72 69 6e 67 20 61 20 | 6d 65 72 67 65 2e 1f 0a |uring a |merge...|
|00003c10| 28 64 65 66 63 6f 6e 73 | 74 20 65 6d 65 72 67 65 |(defcons|t emerge|
|00003c20| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|00003c30| 20 28 71 75 6f 74 65 20 | 28 28 62 75 66 66 65 72 | (quote |((buffer|
|00003c40| 2d 6d 6f 64 69 66 69 65 | 64 2d 70 20 73 65 74 2d |-modifie|d-p set-|
|00003c50| 62 75 66 66 65 72 2d 6d | 6f 64 69 66 69 65 64 2d |buffer-m|odified-|
|00003c60| 70 29 20 62 75 66 66 65 | 72 2d 72 65 61 64 2d 6f |p) buffe|r-read-o|
|00003c70| 6e 6c 79 20 62 75 66 66 | 65 72 2d 61 75 74 6f 2d |nly buff|er-auto-|
|00003c80| 73 61 76 65 2d 66 69 6c | 65 2d 6e 61 6d 65 29 29 |save-fil|e-name))|
|00003c90| 20 28 23 24 20 2e 20 31 | 35 32 38 33 29 29 0a 23 | (#$ . 1|5283)).#|
|00003ca0| 40 36 35 20 56 61 6c 75 | 65 73 20 74 6f 20 62 65 |@65 Valu|es to be|
|00003cb0| 20 61 73 73 69 67 6e 65 | 64 20 74 6f 20 65 6d 65 | assigne|d to eme|
|00003cc0| 72 67 65 2d 73 61 76 65 | 64 2d 76 61 72 69 61 62 |rge-save|d-variab|
|00003cd0| 6c 65 73 20 64 75 72 69 | 6e 67 20 61 20 6d 65 72 |les duri|ng a mer|
|00003ce0| 67 65 2e 1f 0a 28 64 65 | 66 63 6f 6e 73 74 20 65 |ge...(de|fconst e|
|00003cf0| 6d 65 72 67 65 2d 6d 65 | 72 67 69 6e 67 2d 76 61 |merge-me|rging-va|
|00003d00| 6c 75 65 73 20 28 71 75 | 6f 74 65 20 28 6e 69 6c |lues (qu|ote (nil|
|00003d10| 20 74 20 6e 69 6c 29 29 | 20 28 23 24 20 2e 20 31 | t nil))| (#$ . 1|
|00003d20| 35 35 32 34 29 29 0a 23 | 40 35 35 20 52 65 6d 65 |5524)).#|@55 Reme|
|00003d30| 6d 62 65 72 73 20 65 6d | 65 72 67 65 2d 73 61 76 |mbers em|erge-sav|
|00003d40| 65 64 2d 76 61 72 69 61 | 62 6c 65 73 20 66 6f 72 |ed-varia|bles for|
|00003d50| 20 65 6d 65 72 67 65 2d | 41 2d 62 75 66 66 65 72 | emerge-|A-buffer|
|00003d60| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |...(defv|ar emerg|
|00003d70| 65 2d 41 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |e-A-buff|er-value|
|00003d80| 73 20 6e 69 6c 20 28 23 | 24 20 2e 20 31 35 36 36 |s nil (#|$ . 1566|
|00003d90| 30 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |0)).(byt|e-code "|
|00003da0| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00003db0| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00003dc0| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 41 |r-local |emerge-A|
|00003dd0| 2d 62 75 66 66 65 72 2d | 76 61 6c 75 65 73 20 70 |-buffer-|values p|
|00003de0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|00003df0| 34 29 0a 23 40 35 35 20 | 52 65 6d 65 6d 62 65 72 |4).#@55 |Remember|
|00003e00| 73 20 65 6d 65 72 67 65 | 2d 73 61 76 65 64 2d 76 |s emerge|-saved-v|
|00003e10| 61 72 69 61 62 6c 65 73 | 20 66 6f 72 20 65 6d 65 |ariables| for eme|
|00003e20| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 2e 1f 0a 28 |rge-B-bu|ffer...(|
|00003e30| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 42 2d |defvar e|merge-B-|
|00003e40| 62 75 66 66 65 72 2d 76 | 61 6c 75 65 73 20 6e 69 |buffer-v|alues ni|
|00003e50| 6c 20 28 23 24 20 2e 20 | 31 35 38 36 34 29 29 0a |l (#$ . |15864)).|
|00003e60| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00003e70| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00003e80| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00003e90| 63 61 6c 20 65 6d 65 72 | 67 65 2d 42 2d 62 75 66 |cal emer|ge-B-buf|
|00003ea0| 66 65 72 2d 76 61 6c 75 | 65 73 20 70 75 74 20 70 |fer-valu|es put p|
|00003eb0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 23 |reserved| t] 4).#|
|00003ec0| 40 31 34 30 35 20 56 65 | 63 74 6f 72 20 6f 66 20 |@1405 Ve|ctor of |
|00003ed0| 64 69 66 66 65 72 65 6e | 63 65 73 20 62 65 74 77 |differen|ces betw|
|00003ee0| 65 65 6e 20 74 68 65 20 | 76 61 72 69 61 6e 74 73 |een the |variants|
|00003ef0| 2c 20 61 6e 64 20 6d 61 | 72 6b 65 72 73 20 69 6e |, and ma|rkers in|
|00003f00| 20 74 68 65 20 62 75 66 | 66 65 72 73 20 74 6f 0a | the buf|fers to.|
|00003f10| 73 68 6f 77 20 77 68 65 | 72 65 20 74 68 65 79 20 |show whe|re they |
|00003f20| 61 72 65 2e 20 20 45 61 | 63 68 20 64 69 66 66 65 |are. Ea|ch diffe|
|00003f30| 72 65 6e 63 65 20 69 73 | 20 72 65 70 72 65 73 65 |rence is| represe|
|00003f40| 6e 74 65 64 20 62 79 20 | 61 20 76 65 63 74 6f 72 |nted by |a vector|
|00003f50| 20 6f 66 20 73 65 76 65 | 6e 0a 65 6c 65 6d 65 6e | of seve|n.elemen|
|00003f60| 74 73 2e 20 20 54 68 65 | 20 66 69 72 73 74 20 74 |ts. The| first t|
|00003f70| 77 6f 20 61 72 65 20 6d | 61 72 6b 65 72 73 20 74 |wo are m|arkers t|
|00003f80| 6f 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |o the be|ginning |
|00003f90| 61 6e 64 20 65 6e 64 20 | 6f 66 20 74 68 65 20 64 |and end |of the d|
|00003fa0| 69 66 66 65 72 65 6e 63 | 65 0a 73 65 63 74 69 6f |ifferenc|e.sectio|
|00003fb0| 6e 20 69 6e 20 74 68 65 | 20 41 20 62 75 66 66 65 |n in the| A buffe|
|00003fc0| 72 2c 20 74 68 65 20 73 | 65 63 6f 6e 64 20 74 77 |r, the s|econd tw|
|00003fd0| 6f 20 61 72 65 20 6d 61 | 72 6b 65 72 73 20 66 6f |o are ma|rkers fo|
|00003fe0| 72 20 74 68 65 20 42 20 | 62 75 66 66 65 72 2c 20 |r the B |buffer, |
|00003ff0| 74 68 65 20 74 68 69 72 | 64 0a 74 77 6f 20 61 72 |the thir|d.two ar|
|00004000| 65 20 6d 61 72 6b 65 72 | 73 20 66 6f 72 20 74 68 |e marker|s for th|
|00004010| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 2c 20 |e merge |buffer, |
|00004020| 61 6e 64 20 74 68 65 20 | 6c 61 73 74 20 65 6c 65 |and the |last ele|
|00004030| 6d 65 6e 74 20 69 73 20 | 74 68 65 20 22 73 74 61 |ment is |the "sta|
|00004040| 74 65 22 20 6f 66 0a 74 | 68 61 74 20 64 69 66 66 |te" of.t|hat diff|
|00004050| 65 72 65 6e 63 65 20 69 | 6e 20 74 68 65 20 6d 65 |erence i|n the me|
|00004060| 72 67 65 20 62 75 66 66 | 65 72 2e 0a 20 20 41 20 |rge buff|er.. A |
|00004070| 73 65 63 74 69 6f 6e 20 | 6f 66 20 61 20 62 75 66 |section |of a buf|
|00004080| 66 65 72 20 69 73 20 64 | 65 73 63 72 69 62 65 64 |fer is d|escribed|
|00004090| 20 62 79 20 74 77 6f 20 | 6d 61 72 6b 65 72 73 2c | by two |markers,|
|000040a0| 20 6f 6e 65 20 74 6f 20 | 74 68 65 20 62 65 67 69 | one to |the begi|
|000040b0| 6e 6e 69 6e 67 20 6f 66 | 0a 74 68 65 20 66 69 72 |nning of|.the fir|
|000040c0| 73 74 20 6c 69 6e 65 20 | 6f 66 20 74 68 65 20 73 |st line |of the s|
|000040d0| 65 63 74 69 6f 6e 2c 20 | 61 6e 64 20 6f 6e 65 20 |ection, |and one |
|000040e0| 74 6f 20 74 68 65 20 62 | 65 67 69 6e 6e 69 6e 67 |to the b|eginning|
|000040f0| 20 6f 66 20 74 68 65 20 | 66 69 72 73 74 20 6c 69 | of the |first li|
|00004100| 6e 65 0a 61 66 74 65 72 | 20 74 68 65 20 73 65 63 |ne.after| the sec|
|00004110| 74 69 6f 6e 2e 20 20 28 | 49 66 20 74 68 65 20 73 |tion. (|If the s|
|00004120| 65 63 74 69 6f 6e 20 69 | 73 20 65 6d 70 74 79 2c |ection i|s empty,|
|00004130| 20 62 6f 74 68 20 6d 61 | 72 6b 65 72 73 20 70 6f | both ma|rkers po|
|00004140| 69 6e 74 20 74 6f 20 74 | 68 65 20 73 61 6d 65 0a |int to t|he same.|
|00004150| 70 6f 69 6e 74 2e 29 20 | 20 49 66 20 74 68 65 20 |point.) | If the |
|00004160| 73 65 63 74 69 6f 6e 20 | 69 73 20 70 61 72 74 20 |section |is part |
|00004170| 6f 66 20 74 68 65 20 73 | 65 6c 65 63 74 65 64 20 |of the s|elected |
|00004180| 64 69 66 66 65 72 65 6e | 63 65 2c 20 74 68 65 6e |differen|ce, then|
|00004190| 20 74 68 65 20 6d 61 72 | 6b 65 72 73 0a 61 72 65 | the mar|kers.are|
|000041a0| 20 6d 6f 76 65 64 20 69 | 6e 74 6f 20 74 68 65 20 | moved i|nto the |
|000041b0| 66 6c 61 67 73 2c 20 73 | 6f 20 74 68 65 20 75 73 |flags, s|o the us|
|000041c0| 65 72 20 63 61 6e 20 65 | 64 69 74 20 74 68 65 20 |er can e|dit the |
|000041d0| 73 65 63 74 69 6f 6e 20 | 77 69 74 68 6f 75 74 20 |section |without |
|000041e0| 64 69 73 74 75 72 62 69 | 6e 67 0a 74 68 65 20 6d |disturbi|ng.the m|
|000041f0| 61 72 6b 65 72 73 2e 0a | 20 20 54 68 65 20 22 73 |arkers..| The "s|
|00004200| 74 61 74 65 73 22 20 61 | 72 65 3a 0a 09 41 09 09 |tates" a|re:..A..|
|00004210| 74 68 65 20 6d 65 72 67 | 65 20 62 75 66 66 65 72 |the merg|e buffer|
|00004220| 20 63 75 72 72 65 6e 74 | 6c 79 20 63 6f 6e 74 61 | current|ly conta|
|00004230| 69 6e 73 20 74 68 65 20 | 41 20 76 61 72 69 61 6e |ins the |A varian|
|00004240| 74 0a 09 42 09 09 74 68 | 65 20 6d 65 72 67 65 20 |t..B..th|e merge |
|00004250| 62 75 66 66 65 72 20 63 | 75 72 72 65 6e 74 6c 79 |buffer c|urrently|
|00004260| 20 63 6f 6e 74 61 69 6e | 73 20 74 68 65 20 42 20 | contain|s the B |
|00004270| 76 61 72 69 61 6e 74 0a | 09 64 65 66 61 75 6c 74 |variant.|.default|
|00004280| 2d 41 09 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |-A.the m|erge buf|
|00004290| 66 65 72 20 63 6f 6e 74 | 61 69 6e 73 20 74 68 65 |fer cont|ains the|
|000042a0| 20 41 20 76 61 72 69 61 | 6e 74 20 62 79 20 64 65 | A varia|nt by de|
|000042b0| 66 61 75 6c 74 2c 0a 09 | 09 09 62 75 74 20 74 68 |fault,..|..but th|
|000042c0| 69 73 20 64 69 66 66 65 | 72 65 6e 63 65 20 68 61 |is diffe|rence ha|
|000042d0| 73 6e 27 74 20 62 65 65 | 6e 20 73 65 6c 65 63 74 |sn't bee|n select|
|000042e0| 65 64 20 79 65 74 2c 20 | 73 6f 0a 09 09 09 63 68 |ed yet, |so....ch|
|000042f0| 61 6e 67 65 2d 64 65 66 | 61 75 6c 74 20 63 6f 6d |ange-def|ault com|
|00004300| 6d 61 6e 64 73 20 63 61 | 6e 20 61 6c 74 65 72 20 |mands ca|n alter |
|00004310| 69 74 0a 09 64 65 66 61 | 75 6c 74 2d 42 09 74 68 |it..defa|ult-B.th|
|00004320| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 20 63 |e merge |buffer c|
|00004330| 6f 6e 74 61 69 6e 73 20 | 74 68 65 20 42 20 76 61 |ontains |the B va|
|00004340| 72 69 61 6e 74 20 62 79 | 20 64 65 66 61 75 6c 74 |riant by| default|
|00004350| 2c 0a 09 09 09 62 75 74 | 20 74 68 69 73 20 64 69 |,....but| this di|
|00004360| 66 66 65 72 65 6e 63 65 | 20 68 61 73 6e 27 74 20 |fference| hasn't |
|00004370| 62 65 65 6e 20 73 65 6c | 65 63 74 65 64 20 79 65 |been sel|ected ye|
|00004380| 74 2c 20 73 6f 0a 09 09 | 09 63 68 61 6e 67 65 2d |t, so...|.change-|
|00004390| 64 65 66 61 75 6c 74 20 | 63 6f 6d 6d 61 6e 64 73 |default |commands|
|000043a0| 20 63 61 6e 20 61 6c 74 | 65 72 20 69 74 0a 09 70 | can alt|er it..p|
|000043b0| 72 65 66 65 72 2d 41 09 | 69 6e 20 61 20 74 68 72 |refer-A.|in a thr|
|000043c0| 65 65 2d 66 69 6c 65 20 | 6d 65 72 67 65 2c 20 74 |ee-file |merge, t|
|000043d0| 68 65 20 41 20 76 61 72 | 69 61 6e 74 20 69 73 20 |he A var|iant is |
|000043e0| 74 68 65 20 70 72 65 66 | 65 72 72 65 64 0a 09 09 |the pref|erred...|
|000043f0| 09 63 68 6f 69 63 65 0a | 09 70 72 65 66 65 72 2d |.choice.|.prefer-|
|00004400| 42 09 69 6e 20 61 20 74 | 68 72 65 65 2d 66 69 6c |B.in a t|hree-fil|
|00004410| 65 20 6d 65 72 67 65 2c | 20 74 68 65 20 42 20 76 |e merge,| the B v|
|00004420| 61 72 69 61 6e 74 20 69 | 73 20 74 68 65 20 70 72 |ariant i|s the pr|
|00004430| 65 66 65 72 72 65 64 0a | 09 09 09 63 68 6f 69 63 |eferred.|...choic|
|00004440| 65 1f 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |e..(defv|ar emerg|
|00004450| 65 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |e-differ|ence-lis|
|00004460| 74 20 6e 69 6c 20 28 23 | 24 20 2e 20 31 36 30 37 |t nil (#|$ . 1607|
|00004470| 30 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |0)).(byt|e-code "|
|00004480| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00004490| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|000044a0| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 64 |r-local |emerge-d|
|000044b0| 69 66 66 65 72 65 6e 63 | 65 2d 6c 69 73 74 20 70 |ifferenc|e-list p|
|000044c0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|000044d0| 34 29 0a 23 40 34 34 20 | 54 68 65 20 64 69 66 66 |4).#@44 |The diff|
|000044e0| 65 72 65 6e 63 65 20 74 | 68 61 74 20 69 73 20 63 |erence t|hat is c|
|000044f0| 75 72 72 65 6e 74 6c 79 | 20 73 65 6c 65 63 74 65 |urrently| selecte|
|00004500| 64 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |d...(def|var emer|
|00004510| 67 65 2d 63 75 72 72 65 | 6e 74 2d 64 69 66 66 65 |ge-curre|nt-diffe|
|00004520| 72 65 6e 63 65 20 2d 31 | 20 28 23 24 20 2e 20 31 |rence -1| (#$ . 1|
|00004530| 37 36 32 34 29 29 0a 28 | 62 79 74 65 2d 63 6f 64 |7624)).(|byte-cod|
|00004540| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00004550| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004560| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 6d 65 72 67 |ffer-loc|al emerg|
|00004570| 65 2d 63 75 72 72 65 6e | 74 2d 64 69 66 66 65 72 |e-curren|t-differ|
|00004580| 65 6e 63 65 20 70 75 74 | 20 70 72 65 73 65 72 76 |ence put| preserv|
|00004590| 65 64 20 74 5d 20 34 29 | 0a 23 40 33 30 20 4e 75 |ed t] 4)|.#@30 Nu|
|000045a0| 6d 62 65 72 20 6f 66 20 | 64 69 66 66 65 72 65 6e |mber of |differen|
|000045b0| 63 65 73 20 66 6f 75 6e | 64 2e 1f 0a 28 64 65 66 |ces foun|d...(def|
|000045c0| 76 61 72 20 65 6d 65 72 | 67 65 2d 6e 75 6d 62 65 |var emer|ge-numbe|
|000045d0| 72 2d 6f 66 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |r-of-dif|ferences|
|000045e0| 20 6e 69 6c 20 28 23 24 | 20 2e 20 31 37 38 32 32 | nil (#$| . 17822|
|000045f0| 29 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |)).(byte|-code ".|
|00004600| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00004610| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00004620| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 6e 75 |-local e|merge-nu|
|00004630| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|00004640| 63 65 73 20 70 75 74 20 | 70 72 65 73 65 72 76 65 |ces put |preserve|
|00004650| 64 20 74 5d 20 34 29 0a | 23 40 31 38 36 20 54 68 |d t] 4).|#@186 Th|
|00004660| 65 20 6c 6f 63 61 6c 20 | 6b 65 79 6d 61 70 20 66 |e local |keymap f|
|00004670| 6f 72 20 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |or the m|erge buf|
|00004680| 66 65 72 2c 20 77 69 74 | 68 20 74 68 65 20 65 6d |fer, wit|h the em|
|00004690| 65 72 67 65 20 63 6f 6d | 6d 61 6e 64 73 20 64 65 |erge com|mands de|
|000046a0| 66 69 6e 65 64 20 69 6e | 0a 69 74 2e 20 20 55 73 |fined in|.it. Us|
|000046b0| 65 64 20 74 6f 20 73 61 | 76 65 20 74 68 65 20 6c |ed to sa|ve the l|
|000046c0| 6f 63 61 6c 20 6b 65 79 | 6d 61 70 20 64 75 72 69 |ocal key|map duri|
|000046d0| 6e 67 20 66 61 73 74 20 | 6d 6f 64 65 2c 20 77 68 |ng fast |mode, wh|
|000046e0| 65 6e 20 74 68 65 20 6c | 6f 63 61 6c 20 6b 65 79 |en the l|ocal key|
|000046f0| 6d 61 70 20 69 73 0a 72 | 65 70 6c 61 63 65 64 20 |map is.r|eplaced |
|00004700| 62 79 20 65 6d 65 72 67 | 65 2d 66 61 73 74 2d 6b |by emerg|e-fast-k|
|00004710| 65 79 6d 61 70 2e 1f 0a | 28 64 65 66 76 61 72 20 |eymap...|(defvar |
|00004720| 65 6d 65 72 67 65 2d 65 | 64 69 74 2d 6b 65 79 6d |emerge-e|dit-keym|
|00004730| 61 70 20 6e 69 6c 20 28 | 23 24 20 2e 20 31 38 30 |ap nil (|#$ . 180|
|00004740| 31 34 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |14)).(by|te-code |
|00004750| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00004760| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004770| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00004780| 65 64 69 74 2d 6b 65 79 | 6d 61 70 20 70 75 74 20 |edit-key|map put |
|00004790| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 34 29 0a |preserve|d t] 4).|
|000047a0| 23 40 34 39 20 54 68 65 | 20 6f 72 69 67 69 6e 61 |#@49 The| origina|
|000047b0| 6c 20 6c 6f 63 61 6c 20 | 6b 65 79 6d 61 70 20 66 |l local |keymap f|
|000047c0| 6f 72 20 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |or the m|erge buf|
|000047d0| 66 65 72 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |fer...(d|efvar em|
|000047e0| 65 72 67 65 2d 6f 6c 64 | 2d 6b 65 79 6d 61 70 20 |erge-old|-keymap |
|000047f0| 6e 69 6c 20 28 23 24 20 | 2e 20 31 38 33 34 31 29 |nil (#$ |. 18341)|
|00004800| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00004810| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00004820| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00004830| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 6f 6c 64 |local em|erge-old|
|00004840| 2d 6b 65 79 6d 61 70 20 | 70 75 74 20 70 72 65 73 |-keymap |put pres|
|00004850| 65 72 76 65 64 20 74 5d | 20 34 29 0a 23 40 39 36 |erved t]| 4).#@96|
|00004860| 20 2a 49 66 20 6e 6f 6e | 2d 6e 69 6c 2c 20 65 6d | *If non|-nil, em|
|00004870| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 41 20 61 6e |erge-sel|ect-A an|
|00004880| 64 20 65 6d 65 72 67 65 | 2d 73 65 6c 65 63 74 2d |d emerge|-select-|
|00004890| 42 20 61 75 74 6f 6d 61 | 74 69 63 61 6c 6c 79 20 |B automa|tically |
|000048a0| 61 64 76 61 6e 63 65 20 | 74 6f 0a 74 68 65 20 6e |advance |to.the n|
|000048b0| 65 78 74 20 64 69 66 66 | 65 72 65 6e 63 65 2e 1f |ext diff|erence..|
|000048c0| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|000048d0| 61 75 74 6f 2d 61 64 76 | 61 6e 63 65 20 6e 69 6c |auto-adv|ance nil|
|000048e0| 20 28 23 24 20 2e 20 2d | 31 38 35 32 39 29 29 0a | (#$ . -|18529)).|
|000048f0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004900| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004910| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004920| 63 61 6c 20 65 6d 65 72 | 67 65 2d 61 75 74 6f 2d |cal emer|ge-auto-|
|00004930| 61 64 76 61 6e 63 65 20 | 70 75 74 20 70 72 65 73 |advance |put pres|
|00004940| 65 72 76 65 64 20 74 5d | 20 34 29 0a 23 40 38 35 |erved t]| 4).#@85|
|00004950| 20 2a 49 66 20 6e 6f 6e | 2d 6e 69 6c 2c 20 64 69 | *If non|-nil, di|
|00004960| 66 66 65 72 65 6e 63 65 | 73 20 66 6f 72 20 77 68 |fference|s for wh|
|00004970| 69 63 68 20 74 68 65 72 | 65 20 69 73 20 61 20 70 |ich ther|e is a p|
|00004980| 72 65 66 65 72 65 6e 63 | 65 20 61 72 65 20 61 75 |referenc|e are au|
|00004990| 74 6f 6d 61 74 69 63 61 | 6c 6c 79 0a 73 6b 69 70 |tomatica|lly.skip|
|000049a0| 70 65 64 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |ped...(d|efvar em|
|000049b0| 65 72 67 65 2d 73 6b 69 | 70 2d 70 72 65 66 65 72 |erge-ski|p-prefer|
|000049c0| 73 20 6e 69 6c 20 28 23 | 24 20 2e 20 2d 31 38 37 |s nil (#|$ . -187|
|000049d0| 36 39 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |69)).(by|te-code |
|000049e0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000049f0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004a00| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00004a10| 73 6b 69 70 2d 70 72 65 | 66 65 72 73 20 70 75 74 |skip-pre|fers put|
|00004a20| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00004a30| 0a 23 40 32 32 38 20 48 | 6f 6f 6b 73 20 74 6f 20 |.#@228 H|ooks to |
|00004a40| 72 75 6e 20 69 6e 20 74 | 68 65 20 6d 65 72 67 65 |run in t|he merge|
|00004a50| 20 62 75 66 66 65 72 20 | 61 66 74 65 72 20 74 68 | buffer |after th|
|00004a60| 65 20 6d 65 72 67 65 20 | 68 61 73 20 62 65 65 6e |e merge |has been|
|00004a70| 20 66 69 6e 69 73 68 65 | 64 2e 0a 60 65 6d 65 72 | finishe|d..`emer|
|00004a80| 67 65 2d 70 72 65 66 69 | 78 2d 61 72 67 75 6d 65 |ge-prefi|x-argume|
|00004a90| 6e 74 27 20 77 69 6c 6c | 20 68 6f 6c 64 20 74 68 |nt' will| hold th|
|00004aa0| 65 20 70 72 65 66 69 78 | 20 61 72 67 75 6d 65 6e |e prefix| argumen|
|00004ab0| 74 20 6f 66 20 74 68 65 | 20 60 65 6d 65 72 67 65 |t of the| `emerge|
|00004ac0| 2d 71 75 69 74 27 0a 63 | 6f 6d 6d 61 6e 64 2e 0a |-quit'.c|ommand..|
|00004ad0| 54 68 69 73 20 69 73 20 | 2a 6e 6f 74 2a 20 61 20 |This is |*not* a |
|00004ae0| 75 73 65 72 20 6f 70 74 | 69 6f 6e 2c 20 73 69 6e |user opt|ion, sin|
|00004af0| 63 65 20 45 6d 65 72 67 | 65 20 75 73 65 73 20 69 |ce Emerg|e uses i|
|00004b00| 74 20 66 6f 72 20 69 74 | 73 20 6f 77 6e 20 70 72 |t for it|s own pr|
|00004b10| 6f 63 65 73 73 69 6e 67 | 2e 1f 0a 28 64 65 66 76 |ocessing|...(defv|
|00004b20| 61 72 20 65 6d 65 72 67 | 65 2d 71 75 69 74 2d 68 |ar emerg|e-quit-h|
|00004b30| 6f 6f 6b 20 6e 69 6c 20 | 28 23 24 20 2e 20 31 38 |ook nil |(#$ . 18|
|00004b40| 39 39 39 29 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |999)).(b|yte-code|
|00004b50| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00004b60| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00004b70| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 6d 65 72 67 65 |fer-loca|l emerge|
|00004b80| 2d 71 75 69 74 2d 68 6f | 6f 6b 20 70 75 74 20 70 |-quit-ho|ok put p|
|00004b90| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 23 |reserved| t] 4).#|
|00004ba0| 40 36 36 20 44 65 73 63 | 72 69 62 65 73 20 6f 75 |@66 Desc|ribes ou|
|00004bb0| 74 70 75 74 20 64 65 73 | 74 69 6e 61 74 69 6f 6e |tput des|tination|
|00004bc0| 20 6f 66 20 65 6d 65 72 | 67 65 2c 20 66 6f 72 20 | of emer|ge, for |
|00004bd0| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 2d 6e 61 6d |`emerge-|file-nam|
|00004be0| 65 73 27 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 6d |es'...(d|efvar em|
|00004bf0| 65 72 67 65 2d 6f 75 74 | 70 75 74 2d 64 65 73 63 |erge-out|put-desc|
|00004c00| 72 69 70 74 69 6f 6e 20 | 6e 69 6c 20 28 23 24 20 |ription |nil (#$ |
|00004c10| 2e 20 31 39 33 36 34 29 | 29 0a 28 62 79 74 65 2d |. 19364)|).(byte-|
|00004c20| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00004c30| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00004c40| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 6d |-buffer-|local em|
|00004c50| 65 72 67 65 2d 6f 75 74 | 70 75 74 2d 64 65 73 63 |erge-out|put-desc|
|00004c60| 72 69 70 74 69 6f 6e 20 | 70 75 74 20 70 72 65 73 |ription |put pres|
|00004c70| 65 72 76 65 64 20 74 5d | 20 34 29 0a 28 64 65 66 |erved t]| 4).(def|
|00004c80| 61 6c 69 61 73 20 27 65 | 6d 65 72 67 65 2d 66 69 |alias 'e|merge-fi|
|00004c90| 6c 65 73 2d 69 6e 74 65 | 72 6e 61 6c 20 23 5b 28 |les-inte|rnal #[(|
|00004ca0| 66 69 6c 65 2d 41 20 66 | 69 6c 65 2d 42 20 26 6f |file-A f|ile-B &o|
|00004cb0| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|00004cc0| 68 6f 6f 6b 73 20 71 75 | 69 74 2d 68 6f 6f 6b 73 |hooks qu|it-hooks|
|00004cd0| 20 6f 75 74 70 75 74 2d | 66 69 6c 65 29 20 22 c0 | output-|file) ".|
|00004ce0| 09 21 84 0b 00 c2 c3 09 | 5c 22 88 c0 5c 66 21 84 |.!......|\"..\f!.|
|00004cf0| 16 00 c2 c3 5c 66 5c 22 | 88 c5 09 21 c5 5c 66 21 |....\f\"|...!.\f!|
|00004d00| 1e 06 1e 07 c8 09 21 16 | 09 c8 5c 66 21 16 5c 6e |......!.|..\f!.\n|
|00004d10| 0e 0b 83 35 00 c8 0e 0b | 21 16 5c 66 70 1e 0d ce |...5....|!.\fp...|
|00004d20| 8e 0e 07 71 88 7e 88 cf | 09 21 89 1e 10 83 5a 00 |...q.~..|.!....Z.|
|00004d30| 0e 10 11 d1 d2 d3 09 44 | 45 0e 14 42 16 14 82 5d |.......D|E..B...]|
|00004d40| 00 d5 20 88 2b 70 1e 0d | d6 8e 0e 06 71 88 7e 88 |.. .+p..|....q.~.|
|00004d50| cf 5c 66 21 89 1e 10 83 | 83 00 0e 10 14 d1 d2 d3 |.\f!....|........|
|00004d60| 5c 66 44 45 0e 14 42 16 | 14 82 86 00 d5 20 88 2b |\fDE..B.|..... .+|
|00004d70| d7 0e 07 09 0e 06 5c 66 | 0e 14 0e 18 0e 0b 26 07 |......\f|......&.|
|00004d80| 2a 87 22 20 5b 66 69 6c | 65 2d 72 65 61 64 61 62 |*." [fil|e-readab|
|00004d90| 6c 65 2d 70 20 66 69 6c | 65 2d 41 20 65 72 72 6f |le-p fil|e-A erro|
|00004da0| 72 20 22 46 69 6c 65 20 | 60 25 73 27 20 64 6f 65 |r "File |`%s' doe|
|00004db0| 73 20 6e 6f 74 20 65 78 | 69 73 74 20 6f 72 20 69 |s not ex|ist or i|
|00004dc0| 73 20 6e 6f 74 20 72 65 | 61 64 61 62 6c 65 22 20 |s not re|adable" |
|00004dd0| 66 69 6c 65 2d 42 20 66 | 69 6e 64 2d 66 69 6c 65 |file-B f|ind-file|
|00004de0| 2d 6e 6f 73 65 6c 65 63 | 74 20 62 75 66 66 65 72 |-noselec|t buffer|
|00004df0| 2d 42 20 62 75 66 66 65 | 72 2d 41 20 66 69 6c 65 |-B buffe|r-A file|
|00004e00| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00004e10| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|00004e20| 41 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |A emerge|-last-di|
|00004e30| 72 2d 42 20 6f 75 74 70 | 75 74 2d 66 69 6c 65 20 |r-B outp|ut-file |
|00004e40| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|00004e50| 6f 75 74 70 75 74 20 53 | 74 61 72 74 42 75 66 66 |output S|tartBuff|
|00004e60| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00004e70| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 66 69 |StartBuf|fer)) fi|
|00004e80| 6c 65 2d 6c 6f 63 61 6c | 2d 63 6f 70 79 20 74 65 |le-local|-copy te|
|00004e90| 6d 70 20 6c 61 6d 62 64 | 61 20 6e 69 6c 20 64 65 |mp lambd|a nil de|
|00004ea0| 6c 65 74 65 2d 66 69 6c | 65 20 73 74 61 72 74 75 |lete-fil|e startu|
|00004eb0| 70 2d 68 6f 6f 6b 73 20 | 65 6d 65 72 67 65 2d 76 |p-hooks |emerge-v|
|00004ec0| 65 72 69 66 79 2d 66 69 | 6c 65 2d 62 75 66 66 65 |erify-fi|le-buffe|
|00004ed0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00004ee0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 6d 65 |tartBuff|er)) eme|
|00004ef0| 72 67 65 2d 73 65 74 75 | 70 20 71 75 69 74 2d 68 |rge-setu|p quit-h|
|00004f00| 6f 6f 6b 73 5d 20 39 5d | 29 0a 28 64 65 66 61 6c |ooks] 9]|).(defal|
|00004f10| 69 61 73 20 27 65 6d 65 | 72 67 65 2d 73 65 74 75 |ias 'eme|rge-setu|
|00004f20| 70 20 23 5b 28 62 75 66 | 66 65 72 2d 41 20 66 69 |p #[(buf|fer-A fi|
|00004f30| 6c 65 2d 41 20 62 75 66 | 66 65 72 2d 42 20 66 69 |le-A buf|fer-B fi|
|00004f40| 6c 65 2d 42 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |le-B sta|rtup-hoo|
|00004f50| 6b 73 20 71 75 69 74 2d | 68 6f 6f 6b 73 20 6f 75 |ks quit-|hooks ou|
|00004f60| 74 70 75 74 2d 66 69 6c | 65 29 20 22 c0 09 21 11 |tput-fil|e) "..!.|
|00004f70| c0 5c 6e 21 12 0b 85 0f | 00 c0 0b 21 13 c4 c5 c6 |.\n!....|...!....|
|00004f80| 5c 22 1e 07 70 1e 08 c9 | 8e 0e 5c 6e 71 88 cb 0e |\"..p...|..\nq...|
|00004f90| 07 21 2a 1e 5c 66 70 1e | 08 cd 8e 0e 5c 66 71 88 |.!*.\fp.|....\fq.|
|00004fa0| ce 0e 5c 6e 21 88 cf 16 | 10 d1 d2 21 88 d3 16 14 |..\n!...|...!....|
|00004fb0| 0e 5c 6e 16 15 0e 16 16 | 17 cf 16 18 0e 5c 66 16 |.\n.....|.....\f.|
|00004fc0| 19 0b 83 57 00 da 0b 50 | 82 5d 00 db dc 0e 5c 66 |...W...P|.]....\f|
|00004fd0| 21 50 16 1d de 0e 15 21 | 88 df 20 88 e0 09 5c 6e |!P.....!|.. ...\n|
|00004fe0| 5c 22 89 16 21 47 16 5c | 22 e3 16 24 0e 25 16 26 |\"..!G.\|"..$.%.&|
|00004ff0| e7 20 88 e8 20 88 2a e9 | 0e 5c 6e 0e 16 0e 5c 66 |. .. .*.|.\n...\f|
|00005000| d3 24 88 70 1e 08 ea 8e | 0e 5c 66 71 88 eb ec ed |.$.p....|.\fq....|
|00005010| 5c 22 88 d3 89 16 10 2c | 87 22 20 5b 65 78 70 61 |\".....,|." [expa|
|00005020| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 66 69 6c |nd-file-|name fil|
|00005030| 65 2d 41 20 66 69 6c 65 | 2d 42 20 6f 75 74 70 75 |e-A file|-B outpu|
|00005040| 74 2d 66 69 6c 65 20 65 | 6d 65 72 67 65 2d 75 6e |t-file e|merge-un|
|00005050| 69 71 75 65 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ique-buf|fer-name|
|00005060| 20 22 2a 6d 65 72 67 65 | 22 20 22 2a 22 20 6d 65 | "*merge|" "*" me|
|00005070| 72 67 65 2d 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |rge-buff|er-name |
|00005080| 53 74 61 72 74 42 75 66 | 66 65 72 20 28 28 73 65 |StartBuf|fer ((se|
|00005090| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|000050a0| 66 66 65 72 29 29 20 62 | 75 66 66 65 72 2d 41 20 |ffer)) b|uffer-A |
|000050b0| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|000050c0| 65 20 6d 65 72 67 65 2d | 62 75 66 66 65 72 20 28 |e merge-|buffer (|
|000050d0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000050e0| 74 42 75 66 66 65 72 29 | 29 20 65 6d 65 72 67 65 |tBuffer)|) emerge|
|000050f0| 2d 63 6f 70 79 2d 6d 6f | 64 65 73 20 6e 69 6c 20 |-copy-mo|des nil |
|00005100| 62 75 66 66 65 72 2d 72 | 65 61 64 2d 6f 6e 6c 79 |buffer-r|ead-only|
|00005110| 20 61 75 74 6f 2d 73 61 | 76 65 2d 6d 6f 64 65 20 | auto-sa|ve-mode |
|00005120| 31 20 74 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |1 t emer|ge-mode |
|00005130| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 20 |emerge-A|-buffer |
|00005140| 62 75 66 66 65 72 2d 42 | 20 65 6d 65 72 67 65 2d |buffer-B| emerge-|
|00005150| 42 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |B-buffer| emerge-|
|00005160| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00005170| 65 6d 65 72 67 65 2d 6d | 65 72 67 65 2d 62 75 66 |emerge-m|erge-buf|
|00005180| 66 65 72 20 22 4f 75 74 | 70 75 74 20 74 6f 20 66 |fer "Out|put to f|
|00005190| 69 6c 65 3a 20 22 20 22 | 4f 75 74 70 75 74 20 74 |ile: " "|Output t|
|000051a0| 6f 20 62 75 66 66 65 72 | 3a 20 22 20 62 75 66 66 |o buffer|: " buff|
|000051b0| 65 72 2d 6e 61 6d 65 20 | 65 6d 65 72 67 65 2d 6f |er-name |emerge-o|
|000051c0| 75 74 70 75 74 2d 64 65 | 73 63 72 69 70 74 69 6f |utput-de|scriptio|
|000051d0| 6e 20 69 6e 73 65 72 74 | 2d 62 75 66 66 65 72 20 |n insert|-buffer |
|000051e0| 65 6d 65 72 67 65 2d 73 | 65 74 2d 6b 65 79 73 20 |emerge-s|et-keys |
|000051f0| 65 6d 65 72 67 65 2d 6d | 61 6b 65 2d 64 69 66 66 |emerge-m|ake-diff|
|00005200| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 64 69 66 |-list em|erge-dif|
|00005210| 66 65 72 65 6e 63 65 2d | 6c 69 73 74 20 65 6d 65 |ference-|list eme|
|00005220| 72 67 65 2d 6e 75 6d 62 | 65 72 2d 6f 66 2d 64 69 |rge-numb|er-of-di|
|00005230| 66 66 65 72 65 6e 63 65 | 73 20 2d 31 20 65 6d 65 |fference|s -1 eme|
|00005240| 72 67 65 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |rge-curr|ent-diff|
|00005250| 65 72 65 6e 63 65 20 71 | 75 69 74 2d 68 6f 6f 6b |erence q|uit-hook|
|00005260| 73 20 65 6d 65 72 67 65 | 2d 71 75 69 74 2d 68 6f |s emerge|-quit-ho|
|00005270| 6f 6b 20 65 6d 65 72 67 | 65 2d 72 65 6d 65 6d 62 |ok emerg|e-rememb|
|00005280| 65 72 2d 62 75 66 66 65 | 72 2d 63 68 61 72 61 63 |er-buffe|r-charac|
|00005290| 74 65 72 69 73 74 69 63 | 73 20 65 6d 65 72 67 65 |teristic|s emerge|
|000052a0| 2d 68 61 6e 64 6c 65 2d | 6c 6f 63 61 6c 2d 76 61 |-handle-|local-va|
|000052b0| 72 69 61 62 6c 65 73 20 | 65 6d 65 72 67 65 2d 73 |riables |emerge-s|
|000052c0| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 20 28 28 73 |etup-win|dows ((s|
|000052d0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|000052e0| 75 66 66 65 72 29 29 20 | 72 75 6e 2d 68 6f 6f 6b |uffer)) |run-hook|
|000052f0| 73 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |s startu|p-hooks |
|00005300| 65 6d 65 72 67 65 2d 73 | 74 61 72 74 75 70 2d 68 |emerge-s|tartup-h|
|00005310| 6f 6f 6b 5d 20 36 5d 29 | 0a 28 64 65 66 61 6c 69 |ook] 6])|.(defali|
|00005320| 61 73 20 27 65 6d 65 72 | 67 65 2d 6d 61 6b 65 2d |as 'emer|ge-make-|
|00005330| 64 69 66 66 2d 6c 69 73 | 74 20 23 5b 28 66 69 6c |diff-lis|t #[(fil|
|00005340| 65 2d 41 20 66 69 6c 65 | 2d 42 29 20 22 c0 c1 21 |e-A file|-B) "..!|
|00005350| 12 70 1b c4 8e 5c 6e 71 | 88 c5 20 88 c6 c7 c8 0e |.p...\nq|.. .....|
|00005360| 09 0e 5c 6e cb 0e 5c 66 | 21 cb 0e 0d 21 25 ce 5c |..\n..\f|!...!%.\|
|00005370| 22 88 2a cf 0e 10 21 88 | d1 0e 12 0e 13 0e 14 d5 |".*...!.|........|
|00005380| 5c 6e 21 24 87 22 20 5b | 67 65 74 2d 62 75 66 66 |\n!$." [|get-buff|
|00005390| 65 72 2d 63 72 65 61 74 | 65 20 22 2a 65 6d 65 72 |er-creat|e "*emer|
|000053a0| 67 65 2d 64 69 66 66 2a | 22 20 65 6d 65 72 67 65 |ge-diff*|" emerge|
|000053b0| 2d 64 69 66 66 2d 62 75 | 66 66 65 72 20 53 74 61 |-diff-bu|ffer Sta|
|000053c0| 72 74 42 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |rtBuffer| ((set-b|
|000053d0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|000053e0| 72 29 29 20 65 72 61 73 | 65 2d 62 75 66 66 65 72 |r)) eras|e-buffer|
|000053f0| 20 73 68 65 6c 6c 2d 63 | 6f 6d 6d 61 6e 64 20 66 | shell-c|ommand f|
|00005400| 6f 72 6d 61 74 20 22 25 | 73 20 25 73 20 25 73 20 |ormat "%|s %s %s |
|00005410| 25 73 22 20 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |%s" emer|ge-diff-|
|00005420| 70 72 6f 67 72 61 6d 20 | 65 6d 65 72 67 65 2d 64 |program |emerge-d|
|00005430| 69 66 66 2d 6f 70 74 69 | 6f 6e 73 20 65 6d 65 72 |iff-opti|ons emer|
|00005440| 67 65 2d 70 72 6f 74 65 | 63 74 2d 6d 65 74 61 63 |ge-prote|ct-metac|
|00005450| 68 61 72 73 20 66 69 6c | 65 2d 41 20 66 69 6c 65 |hars fil|e-A file|
|00005460| 2d 42 20 74 20 65 6d 65 | 72 67 65 2d 70 72 65 70 |-B t eme|rge-prep|
|00005470| 61 72 65 2d 65 72 72 6f | 72 2d 6c 69 73 74 20 65 |are-erro|r-list e|
|00005480| 6d 65 72 67 65 2d 64 69 | 66 66 2d 6f 6b 2d 6c 69 |merge-di|ff-ok-li|
|00005490| 6e 65 73 2d 72 65 67 65 | 78 70 20 65 6d 65 72 67 |nes-rege|xp emerg|
|000054a0| 65 2d 63 6f 6e 76 65 72 | 74 2d 64 69 66 66 73 2d |e-conver|t-diffs-|
|000054b0| 74 6f 2d 6d 61 72 6b 65 | 72 73 20 65 6d 65 72 67 |to-marke|rs emerg|
|000054c0| 65 2d 41 2d 62 75 66 66 | 65 72 20 65 6d 65 72 67 |e-A-buff|er emerg|
|000054d0| 65 2d 42 2d 62 75 66 66 | 65 72 20 65 6d 65 72 67 |e-B-buff|er emerg|
|000054e0| 65 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 20 65 |e-merge-|buffer e|
|000054f0| 6d 65 72 67 65 2d 65 78 | 74 72 61 63 74 2d 64 69 |merge-ex|tract-di|
|00005500| 66 66 73 5d 20 38 5d 29 | 0a 28 64 65 66 61 6c 69 |ffs] 8])|.(defali|
|00005510| 61 73 20 27 65 6d 65 72 | 67 65 2d 65 78 74 72 61 |as 'emer|ge-extra|
|00005520| 63 74 2d 64 69 66 66 73 | 20 23 5b 28 64 69 66 66 |ct-diffs| #[(diff|
|00005530| 2d 62 75 66 66 65 72 29 | 20 22 c0 19 70 1a c3 8e |-buffer)| "..p...|
|00005540| 5c 66 71 88 65 62 88 c5 | 0e 06 c0 c7 23 83 ae 00 |\fq.eb..|....#...|
|00005550| c8 c9 94 c9 95 7b 21 1e | 5c 6e cb 94 cb 95 1e 5c |.....{!.|\n.....\|
|00005560| 66 89 1e 0d 83 34 00 c8 | 0e 0d 0e 5c 66 7b 21 82 |f....4..|...\f{!.|
|00005570| 36 00 0e 5c 6e 2a 1e 0e | cf 94 cf 95 7b 1e 10 c8 |6..\n*..|....{...|
|00005580| d1 94 d1 95 7b 21 1e 12 | d3 94 d3 95 1e 5c 66 89 |....{!..|.....\f.|
|00005590| 1e 0d 83 5f 00 c8 0e 0d | 0e 5c 66 7b 21 82 61 00 |..._....|.\f{!.a.|
|000055a0| 0e 12 2a 1e 14 0e 10 d5 | 98 83 7b 00 0e 14 54 16 |..*.....|..{...T.|
|000055b0| 14 0e 5c 6e 54 89 16 5c | 6e 16 0e 82 9c 00 0e 10 |..\nT..\|n.......|
|000055c0| d6 98 83 92 00 0e 0e 54 | 16 0e 0e 12 54 89 16 12 |.......T|....T...|
|000055d0| 16 14 82 9c 00 0e 0e 54 | 16 0e 0e 14 54 16 14 d7 |.......T|....T...|
|000055e0| 0e 5c 6e 0e 0e 0e 12 0e | 14 d8 25 09 42 11 2d 82 |.\n.....|..%.B.-.|
|000055f0| 5c 66 00 2a 09 9f 29 87 | 22 20 5b 6e 69 6c 20 6c |\f.*..).|" [nil l|
|00005600| 69 73 74 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |ist Star|tBuffer |
|00005610| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00005620| 72 74 42 75 66 66 65 72 | 29 29 20 64 69 66 66 2d |rtBuffer|)) diff-|
|00005630| 62 75 66 66 65 72 20 72 | 65 2d 73 65 61 72 63 68 |buffer r|e-search|
|00005640| 2d 66 6f 72 77 61 72 64 | 20 65 6d 65 72 67 65 2d |-forward| emerge-|
|00005650| 6d 61 74 63 68 2d 64 69 | 66 66 2d 6c 69 6e 65 20 |match-di|ff-line |
|00005660| 74 20 73 74 72 69 6e 67 | 2d 74 6f 2d 69 6e 74 20 |t string|-to-int |
|00005670| 31 20 61 2d 62 65 67 69 | 6e 20 33 20 65 20 62 20 |1 a-begi|n 3 e b |
|00005680| 61 2d 65 6e 64 20 34 20 | 64 69 66 66 2d 74 79 70 |a-end 4 |diff-typ|
|00005690| 65 20 35 20 62 2d 62 65 | 67 69 6e 20 37 20 62 2d |e 5 b-be|gin 7 b-|
|000056a0| 65 6e 64 20 22 61 22 20 | 22 64 22 20 76 65 63 74 |end "a" |"d" vect|
|000056b0| 6f 72 20 64 65 66 61 75 | 6c 74 2d 41 5d 20 37 5d |or defau|lt-A] 7]|
|000056c0| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 6d 65 |).(defal|ias 'eme|
|000056d0| 72 67 65 2d 70 72 65 70 | 61 72 65 2d 65 72 72 6f |rge-prep|are-erro|
|000056e0| 72 2d 6c 69 73 74 20 23 | 5b 28 6f 6b 2d 72 65 67 |r-list #|[(ok-reg|
|000056f0| 65 78 70 29 20 22 c0 c1 | 21 12 70 1b c4 8e 5c 6e |exp) "..|!.p...\n|
|00005700| 71 88 c5 20 88 c6 0e 07 | 21 88 c8 0e 09 21 2a 87 |q.. ....|!....!*.|
|00005710| 22 20 5b 67 65 74 2d 62 | 75 66 66 65 72 2d 63 72 |" [get-b|uffer-cr|
|00005720| 65 61 74 65 20 22 2a 65 | 6d 65 72 67 65 2d 64 69 |eate "*e|merge-di|
|00005730| 66 66 2d 65 72 72 6f 72 | 73 2a 22 20 65 6d 65 72 |ff-error|s*" emer|
|00005740| 67 65 2d 64 69 66 66 2d | 65 72 72 6f 72 2d 62 75 |ge-diff-|error-bu|
|00005750| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005760| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00005770| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 72 61 73 |artBuffe|r)) eras|
|00005780| 65 2d 62 75 66 66 65 72 | 20 69 6e 73 65 72 74 2d |e-buffer| insert-|
|00005790| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 64 69 |buffer e|merge-di|
|000057a0| 66 66 2d 62 75 66 66 65 | 72 20 64 65 6c 65 74 65 |ff-buffe|r delete|
|000057b0| 2d 6d 61 74 63 68 69 6e | 67 2d 6c 69 6e 65 73 20 |-matchin|g-lines |
|000057c0| 6f 6b 2d 72 65 67 65 78 | 70 5d 20 32 5d 29 0a 28 |ok-regex|p] 2]).(|
|000057d0| 64 65 66 61 6c 69 61 73 | 20 27 65 6d 65 72 67 65 |defalias| 'emerge|
|000057e0| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|000057f0| 73 74 6f 72 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |stor-int|ernal #[|
|00005800| 28 66 69 6c 65 2d 41 20 | 66 69 6c 65 2d 42 20 66 |(file-A |file-B f|
|00005810| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 26 6f 70 |ile-ance|stor &op|
|00005820| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00005830| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 20 |ooks qui|t-hooks |
|00005840| 6f 75 74 70 75 74 2d 66 | 69 6c 65 29 20 22 c0 09 |output-f|ile) "..|
|00005850| 21 84 0b 00 c2 c3 09 5c | 22 88 c0 5c 66 21 84 16 |!......\|"..\f!..|
|00005860| 00 c2 c3 5c 66 5c 22 88 | c0 0d 21 84 21 00 c2 c3 |...\f\".|..!.!...|
|00005870| 0d 5c 22 88 c6 09 21 c6 | 5c 66 21 c6 0d 21 1e 07 |.\"...!.|\f!..!..|
|00005880| 1e 08 1e 09 ca 09 21 16 | 0b ca 5c 66 21 16 5c 66 |......!.|..\f!.\f|
|00005890| ca 0d 21 16 0d 0e 0e 83 | 4a 00 ca 0e 0e 21 16 0f |..!.....|J....!..|
|000058a0| 70 1e 10 d1 8e 0e 09 71 | 88 7e 88 d2 09 21 89 1e |p......q|.~...!..|
|000058b0| 13 83 6f 00 0e 13 11 d4 | d5 d6 09 44 45 0e 17 42 |..o.....|...DE..B|
|000058c0| 16 17 82 72 00 d8 20 88 | 2b 70 1e 10 d9 8e 0e 08 |...r.. .|+p......|
|000058d0| 71 88 7e 88 d2 5c 66 21 | 89 1e 13 83 98 00 0e 13 |q.~..\f!|........|
|000058e0| 14 d4 d5 d6 5c 66 44 45 | 0e 17 42 16 17 82 9b 00 |....\fDE|..B.....|
|000058f0| d8 20 88 2b 70 1e 10 da | 8e 0e 07 71 88 7e 88 d2 |. .+p...|...q.~..|
|00005900| 0d 21 89 1e 13 83 c1 00 | 0e 13 15 d4 d5 d6 0d 44 |.!......|.......D|
|00005910| 45 0e 17 42 16 17 82 c4 | 00 d8 20 88 2b db 0e 09 |E..B....|.. .+...|
|00005920| 09 0e 08 5c 66 0e 07 0d | 0e 17 0e 1c 0e 0e 26 09 |...\f...|......&.|
|00005930| 2b 87 22 20 5b 66 69 6c | 65 2d 72 65 61 64 61 62 |+." [fil|e-readab|
|00005940| 6c 65 2d 70 20 66 69 6c | 65 2d 41 20 65 72 72 6f |le-p fil|e-A erro|
|00005950| 72 20 22 46 69 6c 65 20 | 60 25 73 27 20 64 6f 65 |r "File |`%s' doe|
|00005960| 73 20 6e 6f 74 20 65 78 | 69 73 74 20 6f 72 20 69 |s not ex|ist or i|
|00005970| 73 20 6e 6f 74 20 72 65 | 61 64 61 62 6c 65 22 20 |s not re|adable" |
|00005980| 66 69 6c 65 2d 42 20 66 | 69 6c 65 2d 61 6e 63 65 |file-B f|ile-ance|
|00005990| 73 74 6f 72 20 66 69 6e | 64 2d 66 69 6c 65 2d 6e |stor fin|d-file-n|
|000059a0| 6f 73 65 6c 65 63 74 20 | 62 75 66 66 65 72 2d 61 |oselect |buffer-a|
|000059b0| 6e 63 65 73 74 6f 72 20 | 62 75 66 66 65 72 2d 42 |ncestor |buffer-B|
|000059c0| 20 62 75 66 66 65 72 2d | 41 20 66 69 6c 65 2d 6e | buffer-|A file-n|
|000059d0| 61 6d 65 2d 64 69 72 65 | 63 74 6f 72 79 20 65 6d |ame-dire|ctory em|
|000059e0| 65 72 67 65 2d 6c 61 73 | 74 2d 64 69 72 2d 41 20 |erge-las|t-dir-A |
|000059f0| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|00005a00| 42 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |B emerge|-last-di|
|00005a10| 72 2d 61 6e 63 65 73 74 | 6f 72 20 6f 75 74 70 75 |r-ancest|or outpu|
|00005a20| 74 2d 66 69 6c 65 20 65 | 6d 65 72 67 65 2d 6c 61 |t-file e|merge-la|
|00005a30| 73 74 2d 64 69 72 2d 6f | 75 74 70 75 74 20 53 74 |st-dir-o|utput St|
|00005a40| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|00005a50| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005a60| 65 72 29 29 20 66 69 6c | 65 2d 6c 6f 63 61 6c 2d |er)) fil|e-local-|
|00005a70| 63 6f 70 79 20 74 65 6d | 70 20 6c 61 6d 62 64 61 |copy tem|p lambda|
|00005a80| 20 6e 69 6c 20 64 65 6c | 65 74 65 2d 66 69 6c 65 | nil del|ete-file|
|00005a90| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 65 | startup|-hooks e|
|00005aa0| 6d 65 72 67 65 2d 76 65 | 72 69 66 79 2d 66 69 6c |merge-ve|rify-fil|
|00005ab0| 65 2d 62 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |e-buffer| ((set-b|
|00005ac0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005ad0| 72 29 29 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |r)) ((se|t-buffer|
|00005ae0| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|00005af0| 6d 65 72 67 65 2d 73 65 | 74 75 70 2d 77 69 74 68 |merge-se|tup-with|
|00005b00| 2d 61 6e 63 65 73 74 6f | 72 20 71 75 69 74 2d 68 |-ancesto|r quit-h|
|00005b10| 6f 6f 6b 73 5d 20 31 31 | 5d 29 0a 28 64 65 66 61 |ooks] 11|]).(defa|
|00005b20| 6c 69 61 73 20 27 65 6d | 65 72 67 65 2d 73 65 74 |lias 'em|erge-set|
|00005b30| 75 70 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |up-with-|ancestor|
|00005b40| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 66 69 6c | #[(buff|er-A fil|
|00005b50| 65 2d 41 20 62 75 66 66 | 65 72 2d 42 20 66 69 6c |e-A buff|er-B fil|
|00005b60| 65 2d 42 20 62 75 66 66 | 65 72 2d 61 6e 63 65 73 |e-B buff|er-ances|
|00005b70| 74 6f 72 20 66 69 6c 65 | 2d 61 6e 63 65 73 74 6f |tor file|-ancesto|
|00005b80| 72 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |r &optio|nal star|
|00005b90| 74 75 70 2d 68 6f 6f 6b | 73 20 71 75 69 74 2d 68 |tup-hook|s quit-h|
|00005ba0| 6f 6f 6b 73 20 6f 75 74 | 70 75 74 2d 66 69 6c 65 |ooks out|put-file|
|00005bb0| 29 20 22 c0 09 21 11 c0 | 5c 6e 21 12 c0 0b 21 13 |) "..!..|\n!...!.|
|00005bc0| 5c 66 85 13 00 c0 5c 66 | 21 14 c5 c6 c7 5c 22 1e |\f....\f|!....\".|
|00005bd0| 08 70 1e 09 ca 8e 0e 0b | 71 88 cc 0e 08 21 2a 1e |.p......|q....!*.|
|00005be0| 0d 70 1e 09 ce 8e 0e 0d | 71 88 cf 0e 0b 21 88 d0 |.p......|q....!..|
|00005bf0| 16 11 d2 d3 21 88 d4 16 | 15 0e 0b 16 16 0e 17 16 |....!...|........|
|00005c00| 18 0e 19 16 1a 0e 0d 16 | 1b 5c 66 83 5c 5c 00 dc |........|.\f.\\..|
|00005c10| 5c 66 50 82 62 00 dd de | 0e 0d 21 50 16 1f e0 0e |\fP.b...|..!P....|
|00005c20| 16 21 88 e1 20 88 e2 09 | 5c 6e 0b 23 89 16 23 47 |.!.. ...|\n.#..#G|
|00005c30| 16 24 e5 16 26 0e 27 16 | 28 e9 20 88 ea 20 88 eb |.$..&.'.|(. .. ..|
|00005c40| 20 88 2a ec 0e 0b 0e 17 | 0e 0d d4 24 88 70 1e 09 | .*.....|...$.p..|
|00005c50| ed 8e 0e 0d 71 88 ee ef | f0 5c 22 88 d4 89 16 11 |....q...|.\".....|
|00005c60| 2c 87 22 20 5b 65 78 70 | 61 6e 64 2d 66 69 6c 65 |,." [exp|and-file|
|00005c70| 2d 6e 61 6d 65 20 66 69 | 6c 65 2d 41 20 66 69 6c |-name fi|le-A fil|
|00005c80| 65 2d 42 20 66 69 6c 65 | 2d 61 6e 63 65 73 74 6f |e-B file|-ancesto|
|00005c90| 72 20 6f 75 74 70 75 74 | 2d 66 69 6c 65 20 65 6d |r output|-file em|
|00005ca0| 65 72 67 65 2d 75 6e 69 | 71 75 65 2d 62 75 66 66 |erge-uni|que-buff|
|00005cb0| 65 72 2d 6e 61 6d 65 20 | 22 2a 6d 65 72 67 65 22 |er-name |"*merge"|
|00005cc0| 20 22 2a 22 20 6d 65 72 | 67 65 2d 62 75 66 66 65 | "*" mer|ge-buffe|
|00005cd0| 72 2d 6e 61 6d 65 20 53 | 74 61 72 74 42 75 66 66 |r-name S|tartBuff|
|00005ce0| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00005cf0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 62 75 |StartBuf|fer)) bu|
|00005d00| 66 66 65 72 2d 41 20 67 | 65 74 2d 62 75 66 66 65 |ffer-A g|et-buffe|
|00005d10| 72 2d 63 72 65 61 74 65 | 20 6d 65 72 67 65 2d 62 |r-create| merge-b|
|00005d20| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00005d30| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00005d40| 20 65 6d 65 72 67 65 2d | 63 6f 70 79 2d 6d 6f 64 | emerge-|copy-mod|
|00005d50| 65 73 20 6e 69 6c 20 62 | 75 66 66 65 72 2d 72 65 |es nil b|uffer-re|
|00005d60| 61 64 2d 6f 6e 6c 79 20 | 61 75 74 6f 2d 73 61 76 |ad-only |auto-sav|
|00005d70| 65 2d 6d 6f 64 65 20 31 | 20 74 20 65 6d 65 72 67 |e-mode 1| t emerg|
|00005d80| 65 2d 6d 6f 64 65 20 65 | 6d 65 72 67 65 2d 41 2d |e-mode e|merge-A-|
|00005d90| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 42 20 |buffer b|uffer-B |
|00005da0| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 20 |emerge-B|-buffer |
|00005db0| 62 75 66 66 65 72 2d 61 | 6e 63 65 73 74 6f 72 20 |buffer-a|ncestor |
|00005dc0| 65 6d 65 72 67 65 2d 61 | 6e 63 65 73 74 6f 72 2d |emerge-a|ncestor-|
|00005dd0| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 6d 65 |buffer e|merge-me|
|00005de0| 72 67 65 2d 62 75 66 66 | 65 72 20 22 4f 75 74 70 |rge-buff|er "Outp|
|00005df0| 75 74 20 74 6f 20 66 69 | 6c 65 3a 20 22 20 22 4f |ut to fi|le: " "O|
|00005e00| 75 74 70 75 74 20 74 6f | 20 62 75 66 66 65 72 3a |utput to| buffer:|
|00005e10| 20 22 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 | " buffe|r-name e|
|00005e20| 6d 65 72 67 65 2d 6f 75 | 74 70 75 74 2d 64 65 73 |merge-ou|tput-des|
|00005e30| 63 72 69 70 74 69 6f 6e | 20 69 6e 73 65 72 74 2d |cription| insert-|
|00005e40| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 73 65 |buffer e|merge-se|
|00005e50| 74 2d 6b 65 79 73 20 65 | 6d 65 72 67 65 2d 6d 61 |t-keys e|merge-ma|
|00005e60| 6b 65 2d 64 69 66 66 33 | 2d 6c 69 73 74 20 65 6d |ke-diff3|-list em|
|00005e70| 65 72 67 65 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |erge-dif|ference-|
|00005e80| 6c 69 73 74 20 65 6d 65 | 72 67 65 2d 6e 75 6d 62 |list eme|rge-numb|
|00005e90| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00005ea0| 73 20 2d 31 20 65 6d 65 | 72 67 65 2d 63 75 72 72 |s -1 eme|rge-curr|
|00005eb0| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 71 |ent-diff|erence q|
|00005ec0| 75 69 74 2d 68 6f 6f 6b | 73 20 65 6d 65 72 67 65 |uit-hook|s emerge|
|00005ed0| 2d 71 75 69 74 2d 68 6f | 6f 6b 20 65 6d 65 72 67 |-quit-ho|ok emerg|
|00005ee0| 65 2d 72 65 6d 65 6d 62 | 65 72 2d 62 75 66 66 65 |e-rememb|er-buffe|
|00005ef0| 72 2d 63 68 61 72 61 63 | 74 65 72 69 73 74 69 63 |r-charac|teristic|
|00005f00| 73 20 65 6d 65 72 67 65 | 2d 73 65 6c 65 63 74 2d |s emerge|-select-|
|00005f10| 70 72 65 66 65 72 2d 42 | 73 20 65 6d 65 72 67 65 |prefer-B|s emerge|
|00005f20| 2d 68 61 6e 64 6c 65 2d | 6c 6f 63 61 6c 2d 76 61 |-handle-|local-va|
|00005f30| 72 69 61 62 6c 65 73 20 | 65 6d 65 72 67 65 2d 73 |riables |emerge-s|
|00005f40| 65 74 75 70 2d 77 69 6e | 64 6f 77 73 20 28 28 73 |etup-win|dows ((s|
|00005f50| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00005f60| 75 66 66 65 72 29 29 20 | 72 75 6e 2d 68 6f 6f 6b |uffer)) |run-hook|
|00005f70| 73 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |s startu|p-hooks |
|00005f80| 65 6d 65 72 67 65 2d 73 | 74 61 72 74 75 70 2d 68 |emerge-s|tartup-h|
|00005f90| 6f 6f 6b 5d 20 36 5d 29 | 0a 28 64 65 66 61 6c 69 |ook] 6])|.(defali|
|00005fa0| 61 73 20 27 65 6d 65 72 | 67 65 2d 6d 61 6b 65 2d |as 'emer|ge-make-|
|00005fb0| 64 69 66 66 33 2d 6c 69 | 73 74 20 23 5b 28 66 69 |diff3-li|st #[(fi|
|00005fc0| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-A fil|e-B file|
|00005fd0| 2d 61 6e 63 65 73 74 6f | 72 29 20 22 c0 c1 21 12 |-ancesto|r) "..!.|
|00005fe0| 70 1b c4 8e 5c 6e 71 88 | c5 20 88 c6 c7 c8 0e 09 |p...\nq.|. ......|
|00005ff0| 0e 5c 6e cb 0e 5c 66 21 | cb 0e 0d 21 cb 0e 0e 21 |.\n..\f!|...!...!|
|00006000| 26 06 cf 5c 22 88 2a d0 | 0e 11 21 88 d2 0e 13 0e |&..\".*.|..!.....|
|00006010| 14 0e 15 d6 5c 6e 21 24 | 87 22 20 5b 67 65 74 2d |....\n!$|." [get-|
|00006020| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 22 2a |buffer-c|reate "*|
|00006030| 65 6d 65 72 67 65 2d 64 | 69 66 66 2a 22 20 65 6d |emerge-d|iff*" em|
|00006040| 65 72 67 65 2d 64 69 66 | 66 2d 62 75 66 66 65 72 |erge-dif|f-buffer|
|00006050| 20 53 74 61 72 74 42 75 | 66 66 65 72 20 28 28 73 | StartBu|ffer ((s|
|00006060| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00006070| 75 66 66 65 72 29 29 20 | 65 72 61 73 65 2d 62 75 |uffer)) |erase-bu|
|00006080| 66 66 65 72 20 73 68 65 | 6c 6c 2d 63 6f 6d 6d 61 |ffer she|ll-comma|
|00006090| 6e 64 20 66 6f 72 6d 61 | 74 20 22 25 73 20 25 73 |nd forma|t "%s %s|
|000060a0| 20 25 73 20 25 73 20 25 | 73 22 20 65 6d 65 72 67 | %s %s %|s" emerg|
|000060b0| 65 2d 64 69 66 66 33 2d | 70 72 6f 67 72 61 6d 20 |e-diff3-|program |
|000060c0| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 6f 70 74 69 |emerge-d|iff-opti|
|000060d0| 6f 6e 73 20 65 6d 65 72 | 67 65 2d 70 72 6f 74 65 |ons emer|ge-prote|
|000060e0| 63 74 2d 6d 65 74 61 63 | 68 61 72 73 20 66 69 6c |ct-metac|hars fil|
|000060f0| 65 2d 41 20 66 69 6c 65 | 2d 61 6e 63 65 73 74 6f |e-A file|-ancesto|
|00006100| 72 20 66 69 6c 65 2d 42 | 20 74 20 65 6d 65 72 67 |r file-B| t emerg|
|00006110| 65 2d 70 72 65 70 61 72 | 65 2d 65 72 72 6f 72 2d |e-prepar|e-error-|
|00006120| 6c 69 73 74 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |list eme|rge-diff|
|00006130| 33 2d 6f 6b 2d 6c 69 6e | 65 73 2d 72 65 67 65 78 |3-ok-lin|es-regex|
|00006140| 70 20 65 6d 65 72 67 65 | 2d 63 6f 6e 76 65 72 74 |p emerge|-convert|
|00006150| 2d 64 69 66 66 73 2d 74 | 6f 2d 6d 61 72 6b 65 72 |-diffs-t|o-marker|
|00006160| 73 20 65 6d 65 72 67 65 | 2d 41 2d 62 75 66 66 65 |s emerge|-A-buffe|
|00006170| 72 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |r emerge|-B-buffe|
|00006180| 72 20 65 6d 65 72 67 65 | 2d 6d 65 72 67 65 2d 62 |r emerge|-merge-b|
|00006190| 75 66 66 65 72 20 65 6d | 65 72 67 65 2d 65 78 74 |uffer em|erge-ext|
|000061a0| 72 61 63 74 2d 64 69 66 | 66 73 33 5d 20 39 5d 29 |ract-dif|fs3] 9])|
|000061b0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 6d 65 72 |.(defali|as 'emer|
|000061c0| 67 65 2d 65 78 74 72 61 | 63 74 2d 64 69 66 66 73 |ge-extra|ct-diffs|
|000061d0| 33 20 23 5b 28 64 69 66 | 66 2d 62 75 66 66 65 72 |3 #[(dif|f-buffer|
|000061e0| 29 20 22 c0 19 70 1a c3 | 8e 5c 66 71 88 c5 c6 c0 |) "..p..|.\fq....|
|000061f0| c7 23 83 6a 00 c8 79 88 | c8 94 c8 95 7b 89 1e 09 |.#.j..y.|....{...|
|00006200| ca 98 84 66 00 c0 89 89 | 1e 0b 1e 5c 66 1e 0d 60 |...f....|...\f..`|
|00006210| 16 0b ce cf 21 16 0d 0e | 0b 62 88 ce d0 21 16 5c |....!...|.b...!.\|
|00006220| 66 d1 0e 0d 40 0e 0d 41 | 40 0e 5c 66 40 0e 5c 66 |f...@..A|@.\f@.\f|
|00006230| 41 40 0e 09 cf 98 83 55 | 00 d2 82 61 00 0e 09 d0 |A@.....U|...a....|
|00006240| 98 83 60 00 d3 82 61 00 | d4 25 2b 09 42 11 29 82 |..`...a.|.%+.B.).|
|00006250| 09 00 2a 09 9f 29 87 22 | 20 5b 6e 69 6c 20 6c 69 |..*..)."| [nil li|
|00006260| 73 74 20 53 74 61 72 74 | 42 75 66 66 65 72 20 28 |st Start|Buffer (|
|00006270| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00006280| 74 42 75 66 66 65 72 29 | 29 20 64 69 66 66 2d 62 |tBuffer)|) diff-b|
|00006290| 75 66 66 65 72 20 72 65 | 2d 73 65 61 72 63 68 2d |uffer re|-search-|
|000062a0| 66 6f 72 77 61 72 64 20 | 22 5e 3d 3d 3d 3d 5c 5c |forward |"^====\\|
|000062b0| 28 2e 3f 5c 5c 29 24 22 | 20 74 20 31 20 61 67 72 |(.?\\)$"| t 1 agr|
|000062c0| 65 65 6d 65 6e 74 20 22 | 32 22 20 70 6f 73 20 67 |eement "|2" pos g|
|000062d0| 72 6f 75 70 2d 33 20 67 | 72 6f 75 70 2d 31 20 65 |roup-3 g|roup-1 e|
|000062e0| 6d 65 72 67 65 2d 67 65 | 74 2d 64 69 66 66 33 2d |merge-ge|t-diff3-|
|000062f0| 67 72 6f 75 70 20 22 31 | 22 20 22 33 22 20 76 65 |group "1|" "3" ve|
|00006300| 63 74 6f 72 20 70 72 65 | 66 65 72 2d 41 20 70 72 |ctor pre|fer-A pr|
|00006310| 65 66 65 72 2d 42 20 64 | 65 66 61 75 6c 74 2d 41 |efer-B d|efault-A|
|00006320| 5d 20 38 5d 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |] 8]).(d|efalias |
|00006330| 27 65 6d 65 72 67 65 2d | 67 65 74 2d 64 69 66 66 |'emerge-|get-diff|
|00006340| 33 2d 67 72 6f 75 70 20 | 23 5b 28 66 69 6c 65 29 |3-group |#[(file)|
|00006350| 20 22 8a c0 c1 5c 6e c3 | 51 21 88 c4 79 88 c5 94 | "...\n.|Q!..y...|
|00006360| c5 95 7b c6 98 83 3e 00 | c7 94 83 2d 00 c8 c4 94 |..{...>.|...-....|
|00006370| c4 95 7b 21 c8 c9 94 c9 | 95 7b 21 54 44 82 48 00 |..{!....|.{!TD.H.|
|00006380| c8 c4 94 c4 95 7b 21 89 | 1e 5c 6e 89 54 29 44 82 |.....{!.|.\n.T)D.|
|00006390| 48 00 c8 c4 94 c4 95 7b | 21 54 89 44 29 87 22 20 |H......{|!T.D)." |
|000063a0| 5b 72 65 2d 73 65 61 72 | 63 68 2d 66 6f 72 77 61 |[re-sear|ch-forwa|
|000063b0| 72 64 20 22 5e 22 20 66 | 69 6c 65 20 22 3a 5c 5c |rd "^" f|ile ":\\|
|000063c0| 28 5b 30 2d 39 5d 2b 5c | 5c 29 5c 5c 28 2c 5c 5c |([0-9]+\|\)\\(,\\|
|000063d0| 28 5b 30 2d 39 5d 2b 5c | 5c 29 5c 5c 29 3f 5c 5c |([0-9]+\|\)\\)?\\|
|000063e0| 28 5b 61 63 5d 5c 5c 29 | 24 22 20 31 20 34 20 22 |([ac]\\)|$" 1 4 "|
|000063f0| 63 22 20 32 20 73 74 72 | 69 6e 67 2d 74 6f 2d 69 |c" 2 str|ing-to-i|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
